diff --git a/LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements b/LArCalorimeter/LArG4/LArG4H6SD/cmt/requirements
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL1H62004CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCAL2H62004CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArFCALH62004CalibCalculatorBase.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
old mode 100755
new mode 100644
index 58197b2db88a94176090d153fd5eed24461bf12c..27ed180d1d8088b3af45880462642f38cbebf183
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.cc
@@ -18,6 +18,11 @@
 LArG4H62004ActiveSDTool::LArG4H62004ActiveSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArCalibrationHitActive")
+  , m_emecSD(nullptr)
+  , m_hecSD(nullptr)
+  , m_fcal1SD(nullptr)
+  , m_fcal2SD(nullptr)
+  , m_fcalColdSD(nullptr)
 {
   declareProperty("EMECVolumes",m_emecVolumes);
   declareProperty("HECVolumes",m_hecVolumes);
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004ActiveSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004CalibSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadCalibrationCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
old mode 100755
new mode 100644
index 95d38c623d7bf1e4ce1a71c26fe3a7643d3398df..3af7ee7524cd5c6bb96173efac1aaa721caab4e4
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.cc
@@ -19,6 +19,8 @@
 LArG4H62004DeadSDTool::LArG4H62004DeadSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArCalibrationHitDeadMaterial")
+  , m_deadSD(nullptr)
+  , m_uninstSD(nullptr)
 {
   declareProperty("doEscapedEnergy",m_do_eep=false);
   declareInterface<ISensitiveDetector>(this);
@@ -62,12 +64,7 @@ StatusCode LArG4H62004DeadSDTool::initializeSD()
 StatusCode LArG4H62004DeadSDTool::Gather()
 {
   // In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
-  // Temporary fix for Hive until isValid is fixed
-  m_HitColl = CxxUtils::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
-#else
   if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<CaloCalibrationHitContainer>(m_HitColl.name());
-#endif
   m_deadSD ->EndOfAthenaEvent( &*m_HitColl );
   if (m_do_eep) m_uninstSD     ->EndOfAthenaEvent( &*m_HitColl );
   return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004DeadSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
old mode 100755
new mode 100644
index edf6532fe242e2b606859551a3f590678f4298ef..6ee7358ef5dfe870d37417ef551cf2caca93b9ae
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.cc
@@ -14,6 +14,7 @@
 LArG4H62004EMECSDTool::LArG4H62004EMECSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArHitEMEC")
+  , m_emecSD(nullptr)
 {
   declareInterface<ISensitiveDetector>(this);
 }
@@ -35,12 +36,7 @@ StatusCode LArG4H62004EMECSDTool::initializeSD()
 StatusCode LArG4H62004EMECSDTool::Gather()
 {
   // In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
-  // Temporary fix for Hive until isValid is fixed
-  m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#else
   if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#endif
   // Hand this collection name off to the SDs.  They will be writing to the
   // collection, but only one at a time!
   m_emecSD->EndOfAthenaEvent( &*m_HitColl );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004EMECSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
old mode 100755
new mode 100644
index f55f025d5f8e974e55f49bb14769578fddeead3b..dc1df99757ea9c7361f140b9c21b004e97c138e5
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.cc
@@ -14,6 +14,9 @@
 LArG4H62004FCALSDTool::LArG4H62004FCALSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArHitFCAL")
+  , m_fcal1SD(nullptr)
+  , m_fcal2SD(nullptr)
+  , m_fcalColdSD(nullptr)
 {
   declareProperty( "FCAL1Volumes" , m_fcal1Volumes );
   declareProperty( "FCAL2Volumes" , m_fcal2Volumes );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004FCALSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
old mode 100755
new mode 100644
index 8816e720e67e6f7e4c7d066fdc1f32832b498ccc..a9dc20e0b04f4cacf9a1716cdc16d09a6dc36279
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.cc
@@ -14,6 +14,7 @@
 LArG4H62004HECSDTool::LArG4H62004HECSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArHitHEC")
+  , m_wheelSD(nullptr)
 {
   declareInterface<ISensitiveDetector>(this);
 }
@@ -38,12 +39,7 @@ StatusCode LArG4H62004HECSDTool::initializeSD()
 StatusCode LArG4H62004HECSDTool::Gather()
 {
   // In this case, *unlike* other SDs, the *tool* owns the collection
-#ifdef ATHENAHIVE
-  // Temporary fix for Hive until isValid is fixed
-  m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#else
   if (!m_HitColl.isValid()) m_HitColl = CxxUtils::make_unique<LArHitContainer>(m_HitColl.name());
-#endif
   // Hand this collection name off to the SDs.  They will be writing to the
   // collection, but only one at a time!
   m_wheelSD->EndOfAthenaEvent( &*m_HitColl );
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004HECSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
old mode 100755
new mode 100644
index c28dc4fd120c676d34e8fe263a9f14c2f1cd1e9a..c067a6aee88d8393ed849eb96f456cf02c9d6c49
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.cc
@@ -17,6 +17,10 @@
 LArG4H62004InactiveSDTool::LArG4H62004InactiveSDTool(const std::string& type, const std::string& name, const IInterface *parent)
   : LArG4SDTool(type,name,parent)
   , m_HitColl("LArCalibrationHitInactive")
+  , m_emecSD(nullptr)
+  , m_hecSD(nullptr)
+  , m_fcal1SD(nullptr)
+  , m_fcal2SD(nullptr)
 {
   declareProperty("EMECVolumes",m_emecVolumes);
   declareProperty("HECVolumes",m_hecVolumes);
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004InactiveSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H62004SD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6BeamSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0Calculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0CalibCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6COLDTCMod0ChannelMap.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
old mode 100755
new mode 100644
index 5fbe7e67afae0992cebe23fec8d4767e8206cf4d..741f543572a4bd71038982062f3021006099f74a
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.cc
@@ -66,12 +66,7 @@ void LArG4H6WarmTCSD::Initialize(G4HCofThisEvent*)
 #ifdef DEBUG_ME
   std::cout<<"LArG4H6WarmTCSD::LArG4H6WarmTCSD: "<<SensitiveDetectorName<<" initializing coll.: "<<collectionName[0]<<std::endl;
 #endif
-#ifdef ATHENAHIVE
-    // Temporary fix for Hive until isValid is fixed
-    m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
-#else
-    if (!m_Collection.isValid()) m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
-#endif
+  if (!m_Collection.isValid()) m_Collection = CxxUtils::make_unique<LArG4H6WarmTCHitCollection>();
 #ifdef DEBUG_ME
   std::cout<<"LArG4H6WarmTCSD::LArG4H6WarmTCSD: initialized "<<collectionName[0]<<" with HCID: "<<G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0])<<std::endl;
 #endif
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSD.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4H6WarmTCSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChCalculator.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChHit.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSDTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArG4TBECBeamChSensitiveDetector.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004EventAction.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArGeoH62004SteppingAction.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6BeamInfo.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/LArTBH6TriggerTimeTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
old mode 100755
new mode 100644
index 332ea4038e75775599c183a4fad38f18b2a06232..b46f1f64cc1bfebce15f894ec7bc2cd8de55808c
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.cc
@@ -18,6 +18,13 @@ TBECBackOuterBarretteTool::TBECBackOuterBarretteTool(const std::string& type, co
   , m_HitColl_gap_se("LArHitEMEC_gap_se")
   , m_HitColl_chcoll("LArHitEMEC_chcoll")
   , m_HitColl_ropt("LArHitEMEC_ropt")
+  , m_gapadjSD(nullptr)
+  , m_gapoldSD(nullptr)
+  , m_gap_eSD(nullptr)
+  , m_gap_sSD(nullptr)
+  , m_gap_seSD(nullptr)
+  , m_chcollSD(nullptr)
+  , m_roptSD(nullptr)
 {
   declareInterface<ISensitiveDetector>(this);
 }
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECBackOuterBarretteTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
old mode 100755
new mode 100644
index 95b90e39d20ee5fee3b35052e4d55f348c6744fe..a89048c053ecffe1f125c12fa535d4a5dc23bfd0
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.cc
@@ -18,6 +18,13 @@ TBECInnerModuleTool::TBECInnerModuleTool(const std::string& type, const std::str
   , m_HitColl_gap_se("LArHitEMEC_gap_se")
   , m_HitColl_chcoll("LArHitEMEC_chcoll")
   , m_HitColl_ropt("LArHitEMEC_ropt")
+  , m_gapadjSD(nullptr)
+  , m_gapoldSD(nullptr)
+  , m_gap_eSD(nullptr)
+  , m_gap_sSD(nullptr)
+  , m_gap_seSD(nullptr)
+  , m_chcollSD(nullptr)
+  , m_roptSD(nullptr)
 {
   declareInterface<ISensitiveDetector>(this);
 }
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECInnerModuleTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.cc
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h b/LArCalorimeter/LArG4/LArG4H6SD/src/TBECOuterModuleTool.h
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_entries.cxx
old mode 100755
new mode 100644
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx b/LArCalorimeter/LArG4/LArG4H6SD/src/components/LArG4H6SDTools_load.cxx
old mode 100755
new mode 100644