diff --git a/LArCalorimeter/LArCalibUtils/src/LArRampBuilder.cxx b/LArCalorimeter/LArCalibUtils/src/LArRampBuilder.cxx
index 240a32a45074528e3e2a8933ca618a74601cc2b3..0eb822b76f0d457fc95c17499e6968a66dc1eb3c 100644
--- a/LArCalorimeter/LArCalibUtils/src/LArRampBuilder.cxx
+++ b/LArCalorimeter/LArCalibUtils/src/LArRampBuilder.cxx
@@ -684,10 +684,9 @@ StatusCode LArRampBuilder::stop()
 	    if (!isADCsat) { rawramp->setsat(data.size()); }	// if no saturation point was found, and ADC saturation did not happen, record the ramp size
 	  }
 	   
-	  if (larRampComplete){ //Produce transient object
-	    larRampComplete->set(chid,(int)gain,rampCoeffs);
-	    NRamp++;
-	  }
+          //Produce transient object
+          larRampComplete->set(chid,(int)gain,rampCoeffs);
+          NRamp++;
 	}// end else (rampfitting suceeded)
       }// end if (build ramp object)
       //Save raw ramp for this cell, if requested by jobOpts
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
index a4f5b220c133189056cfa9fbef2f2890104d9ca4..4a3f6c27b3bae93fba5cf0de1a2a39b101d7fbc3 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.cxx
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/src/TileCisDefaultCalibTool.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
 */
 
 // Gaudi includes
@@ -388,7 +388,7 @@ StatusCode TileCisDefaultCalibTool::finalizeCalculations() {
   //nadc = 0;
 
   // loop over all adcs
-  for (; adcIter != adcIterE; adcIter++) {
+  for (; adcIter != adcIterE; ++adcIter) {
     hwid = (adcIter)->first;
     MeanDacMap = (adcIter)->second;
     MeanSqDacMap = m_MeanSqMap[hwid];
@@ -433,7 +433,7 @@ StatusCode TileCisDefaultCalibTool::finalizeCalculations() {
       badPts = 0;
       maxPointInFitRange = 0.0;
       maxRMS = 0.0;
-      for (; dacIter != dacIterE; dacIter++) {
+      for (; dacIter != dacIterE; ++dacIter) {
         dac = (dacIter)->first;
         mean = (dacIter)->second;
         meansq = (*MeanSqDacMap)[dac];