diff --git a/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx b/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
index 14f1e9cb9aa5283707e54f6d2f13bff4ac910d43..0d473b90bae32c7b41b94ff0abcf28d4d0d9a6be 100644
--- a/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArBadFebMaskingTool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 /********************************************************************
@@ -167,18 +167,12 @@ StatusCode LArBadFebMaskingTool::process (CaloCellContainer* theCont,
 
 // loop over all Febs
 
-  std::vector<HWIdentifier>::const_iterator feb = m_onlineID->feb_begin();
-  std::vector<HWIdentifier>::const_iterator feb_end = m_onlineID->feb_end();
-
-
-  for ( ; feb != feb_end; feb++) {
-
+  for (HWIdentifier febId : m_onlineID->feb_range()) {
       bool toMask1 = false;   // mask because of bad error
       bool inError = false;   // mask because Feb listed in database as being to mask
       bool isDead  = false;   // set to true if Feb is deadAll or deadReadout 
 
 // for debug
-      HWIdentifier febId = (*feb);
       unsigned int ifeb = febId.get_identifier32().get_compact();
       ATH_MSG_DEBUG (" process Feb: " << ifeb);
 
diff --git a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
index 229b6864298745620458016aac03323d26cf891c..0920fde705f7b2dda242aa5c46c481edd91ede7b 100644
--- a/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
+++ b/LArCalorimeter/LArCellRec/src/LArNoisyROAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -54,7 +54,7 @@ StatusCode LArNoisyROAlg::execute (const EventContext& ctx) const
   SG::ReadCondHandle<LArBadFebCont> badHdl(m_knownBadFEBsVecKey, ctx);
   const LArBadFebCont* badCont=*badHdl;
   if(badCont) {
-     for(LArBadFebCont::BadChanVec::const_iterator i = badCont->begin(); i!=badCont->end(); i++) {
+     for(LArBadFebCont::BadChanVec::const_iterator i = badCont->begin(); i!=badCont->end(); ++i) {
         bf.insert(i->first);
      }
      if(bf.size() == 0) {
@@ -69,7 +69,7 @@ StatusCode LArNoisyROAlg::execute (const EventContext& ctx) const
   SG::ReadCondHandle<LArBadFebCont> MNBHdl(m_knownMNBFEBsVecKey, ctx);
   const LArBadFebCont* MNBCont=*MNBHdl;
   if(MNBCont) {
-     for(LArBadFebCont::BadChanVec::const_iterator i = MNBCont->begin(); i!=MNBCont->end(); i++) {
+     for(LArBadFebCont::BadChanVec::const_iterator i = MNBCont->begin(); i!=MNBCont->end(); ++i) {
         MNBfeb.push_back(HWIdentifier(i->first));
      } 
      if(MNBfeb.size() == 0) {
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
index 4a63d1d01069c8536ef7d975c4d4dda3bc4c0342..0790e9ab29999a48277acfa693b512c0173966e2 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonFourMomentumCorrection/ElectronPhotonFourMomentumCorrection/EgammaCalibrationAndSmearingTool.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -187,7 +187,7 @@ private:
 		return AbsEtaCaloPredicateFactory(edges.first, edges.second);
 	}
 
-	const std::vector<EgammaPredicate> AbsEtaCaloPredicatesFactory(const std::vector<std::pair<double, double>> edges) const
+	const std::vector<EgammaPredicate> AbsEtaCaloPredicatesFactory(const std::vector<std::pair<double, double>>& edges) const
 	{
 		std::vector<EgammaPredicate> result;
 		result.reserve(edges.size());
@@ -197,7 +197,7 @@ private:
 		return result;
 	}
 
-	const std::vector<EgammaPredicate> AbsEtaCaloPredicatesFactory(const std::vector<double> edges) const
+	const std::vector<EgammaPredicate> AbsEtaCaloPredicatesFactory(const std::vector<double>& edges) const
 	{
 		std::vector<EgammaPredicate> result;
 		result.reserve(edges.size() - 1);
diff --git a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/Root/egammaMVATool.cxx b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/Root/egammaMVATool.cxx
index 64696cf52e50d6c464330cdd5775f870d4dbe466..65edf22b5435f2ca7ffe851a550162288113977e 100644
--- a/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/Root/egammaMVATool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/egammaMVACalibAnalysis/Root/egammaMVATool.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "egammaMVACalibAnalysis/egammaMVATool.h"
@@ -101,7 +101,6 @@ std::set<std::string> egammaMVATool::guess_variables(const std::string& filename
   TFile f(filename.c_str());
   std::unique_ptr<TObjArray> formulae(dynamic_cast<TObjArray*>(f.Get("formulae")));
   formulae->SetOwner(true);  // by default TObjArray doesn't own elements
-  if (not formulae) { ATH_MSG_FATAL("cannot find formulae in " << filename); }
 
   // TODO: use regex parsing (regex supported only in gcc 4.9, TPRegexp sucks)
   const std::vector<std::string> all_possible_variables = {