diff --git a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
index ddc414f3ae414bbb6bbaa0e83d40c68bded17d19..cb6466276ff54fbc9d1cd1d690efd1ffe58035ad 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -24,6 +24,7 @@ PURPOSE:  applies miscalibration in EM calorimeter
 #include "CLHEP/Units/SystemOfUnits.h"
 #include <CLHEP/Random/Randomize.h>
 
+#include "CaloIdentifier/LArEM_ID.h"
 
 using CLHEP::RandGauss;
 
@@ -95,15 +96,10 @@ void LArCellEmMiscalib::initOnce (const EventContext& ctx) {
     const CaloDetDescrElement* calodde = m_calodetdescrmgr->get_element(id);
     double eta = fabs(calodde->eta_raw());
     double phi = calodde->phi_raw();
-    
-
     int iregion= this->region(barrel_ec,eta,phi);
-
-    ATH_MSG_VERBOSE("barrel_ec,eta,phi,region " << barrel_ec << " " << eta << " " << phi << " " 
-		    << iregion << " " << m_spread1[iregion]);
-
-
     if (iregion>=0) {
+        ATH_MSG_VERBOSE("barrel_ec,eta,phi,region " << barrel_ec << " " << eta << " " << phi << " " 
+		    << iregion << " " << m_spread1[iregion]);
          double spread2=m_sigmaPerCell*RandGauss::shoot(engine,0.,1.);
          m_calib[idHash] = m_spread1[iregion] + spread2;
          if (m_undo ) {
diff --git a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
index c1d147c7d91a099675adde53eed81a5f3b8b2b4b..f0ac2490b38e2fd05454690f810331a62a2c7044 100755
--- a/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
+++ b/LArCalorimeter/LArCellRec/src/LArCellEmMiscalib.h
@@ -19,13 +19,15 @@
 
 #include "StoreGate/StoreGateSvc.h"
 #include "CaloUtils/CaloCellCorrection.h"
-#include "CaloIdentifier/CaloIdManager.h"
-#include "CaloIdentifier/LArEM_ID.h"
+
 #include "CaloDetDescr/CaloDetDescrManager.h"
 #include "AthenaKernel/IOVSvcDefs.h"
 
 #include "AthenaKernel/IAthRNGSvc.h"
 
+class LArEM_ID;
+class CaloIdManager;
+
 namespace CLHEP {
   class HepRandomEngine;
 }
diff --git a/LArCalorimeter/LArCellRec/src/LArCellRescaler.cxx b/LArCalorimeter/LArCellRec/src/LArCellRescaler.cxx
index 302dd10e0a482506c033ed0253a0d0f78ad458e6..8907802114845fc0b95ea92aa1998b69f5e11ebf 100644
--- a/LArCalorimeter/LArCellRec/src/LArCellRescaler.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArCellRescaler.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCellRescaler.h" 
@@ -21,10 +21,9 @@ LArCellRescaler::~LArCellRescaler() {}
 
 
 StatusCode LArCellRescaler::initialize() {
-  ATH_MSG_INFO( " initialization "  );
-
+  ATH_MSG_DEBUG( " initialization "  );
   ATH_CHECK( detStore()->regFcn(&LArCellRescaler::checkConstants,
-                                dynamic_cast<LArCellRescaler*>(this),
+                                this,
                                 m_factors,m_key) );
 
   return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArCellRec/src/LArRAWtoSuperCell.cxx b/LArCalorimeter/LArCellRec/src/LArRAWtoSuperCell.cxx
index 0a1a1d0b971b3b646b7407e25e3cac30bed1503d..0256017d560e2beab52db54bdc230b4c495896ae 100644
--- a/LArCalorimeter/LArCellRec/src/LArRAWtoSuperCell.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArRAWtoSuperCell.cxx
@@ -114,7 +114,7 @@ LArRAWtoSuperCell::execute(const EventContext& context) const
 		}
 		// similarly for OTF-masked cells
 		if(maskedchannel) {
-			LArBadChannel bc = badchannel->offlineStatus(off_id);
+			LArBadChannel bc = maskedchannel->offlineStatus(off_id);
 			if ( !bc.good() && bc.statusBad(LArBadChannel::LArBadChannelSCEnum::maskedOSUMBit) ){
 				cell->setProvenance(cell->provenance()|0x80);
 			}