diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
index d688a857c03ae10dd323ada4f0c0ebf352f4c6ef..a55cd43768e1efa93b7788356e7b51569768fb3c 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronEfficiencyCorrection/Root/AsgElectronEfficiencyCorrectionTool.cxx
@@ -880,7 +880,7 @@ AsgElectronEfficiencyCorrectionTool::currentUncorrSystRegion(
   for (; itr_ptBEGIN != itr_ptEND; ++itr_ptBEGIN) {
     std::map<float, std::vector<float>>::const_iterator itr_ptBEGINplusOne =
       itr_ptBEGIN;
-    itr_ptBEGINplusOne++;
+    ++itr_ptBEGINplusOne;
     // Find the pt bin : Larger or equal from the current and (the next one is
     // the last or the next one is larger).
     if (et >= itr_ptBEGIN->first &&
diff --git a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
index 4efbd4bdc63c8452a574c8f934cf213486deedd4..f2defbe44010baca0f48eb1d72e67fe065395e0a 100644
--- a/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
+++ b/PhysicsAnalysis/ElectronPhotonID/ElectronPhotonSelectorTools/Root/AsgElectronLikelihoodTool.cxx
@@ -1156,7 +1156,7 @@ AsgElectronLikelihoodTool::getFcalEt(const EventContext& ctx) const
   SG::ReadHandle<xAOD::HIEventShapeContainer> HIESCont(m_HIESContKey, ctx);
   xAOD::HIEventShapeContainer::const_iterator es_itr = HIESCont->begin();
   xAOD::HIEventShapeContainer::const_iterator es_end = HIESCont->end();
-  for (; es_itr != es_end; es_itr++) {
+  for (; es_itr != es_end; ++es_itr) {
     double et = (*es_itr)->et();
     const std::string name = (*es_itr)->auxdataConst<std::string>("Summary");
     if (name == "FCal")