diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx b/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
index 8a99345601b2cf83897d06151827e4f8823bd7be..3bede129e1f2aafc4225c99c7e5bbdb08afd2f8d 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/util/postProcessIDPVMHistos.cxx
@@ -26,7 +26,7 @@
 using namespace std;
 
 
-bool file_exists(const string p_name) {
+bool file_exists(const string & p_name) {
   return (gSystem->AccessPathName(p_name.c_str(), kFileExists))?
     false : true;    
 }
diff --git a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
index e354d9d331f1775888f3cb4e4d8dd5629e57684d..afad772dd61cd7675684045513995c17a7f9385e 100644
--- a/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
+++ b/InnerDetector/InDetValidation/InDetSegmentDriftCircleAssValidation/src/SegmentDriftCircleAssValidation.cxx
@@ -483,7 +483,7 @@ void InDet::SegmentDriftCircleAssValidation::efficiencyReconstruction()
     else if(rd > 0.25) d=3; 
     else if(rd <= 0.25) d=4; 
     ++m_efficiency[d]; ++m_events;
-    p++;
+    ++p;
   }
 
 }
@@ -627,7 +627,7 @@ InDet::SegmentDriftCircleAssValidation::findTruth (const InDet::TRT_DriftCircle*
     typedef PRD_MultiTruthCollection::const_iterator TruthIter;
 
     std::pair<TruthIter, TruthIter> r = prdCollection->equal_range(d->identify());
-    for(TruthIter i=r.first; i!=r.second;i++){
+    for(TruthIter i=r.first; i!=r.second;++i){
       if(i==prdCollection->end()) continue;
       mc.push_back(i);
     }
diff --git a/InnerDetector/InDetValidation/InDetTrackValidation/src/SCT_ClusterValidationNtupleWriter.cxx b/InnerDetector/InDetValidation/InDetTrackValidation/src/SCT_ClusterValidationNtupleWriter.cxx
index fbc087ef73d9016f5c5c39ecbf6fa5aff102eab7..954ac9448a3bfa741a666719f6f22f83aa9d3340 100755
--- a/InnerDetector/InDetValidation/InDetTrackValidation/src/SCT_ClusterValidationNtupleWriter.cxx
+++ b/InnerDetector/InDetValidation/InDetTrackValidation/src/SCT_ClusterValidationNtupleWriter.cxx
@@ -358,7 +358,7 @@ StatusCode InDet::SCT_ClusterValidationNtupleWriter::execute() {
             ATH_MSG_WARNING("for current track is TrackStateOnSurfaces == Null, no data will be written for this track");
           } else {
             // Loop over all track states on surfaces
-            for (DataVector<const Trk::TrackStateOnSurface>::const_iterator it=trackStates->begin(); it!=trackStates->end(); it++) {
+            for (DataVector<const Trk::TrackStateOnSurface>::const_iterator it=trackStates->begin(); it!=trackStates->end(); ++it) {
               // Get pointer to RIO of right type
               const InDet::SiClusterOnTrack *clus =
                 dynamic_cast<const InDet::SiClusterOnTrack*>((*it)->measurementOnTrack());
@@ -393,14 +393,14 @@ StatusCode InDet::SCT_ClusterValidationNtupleWriter::execute() {
     // -----------------------
     // get all the RIO_Collections in the container
     InDet::SCT_ClusterContainer::const_iterator containerIterator = m_riocontainer->begin();
-    for( ; containerIterator != m_riocontainer->end(); containerIterator++) {
+    for( ; containerIterator != m_riocontainer->end(); ++containerIterator) {
       ATH_MSG_DEBUG( "There are "  << (*containerIterator)->size() << " entries in the PrepRawDataCollection" );
  
       // ---------------------------------
       //get all the RIOs in the collection
 
       InDet::SCT_ClusterCollection::const_iterator rioIterator = (*containerIterator)->begin();
-      for (; rioIterator != (*containerIterator)->end(); rioIterator++) {
+      for (; rioIterator != (*containerIterator)->end(); ++rioIterator) {
         // get the surface center of the RIO
         if (!(*rioIterator)) {
           ATH_MSG_WARNING( "nullptr to RIO" );
diff --git a/InnerDetector/InDetValidation/InDetTruthVertexValidation/Root/InDetVertexTruthMatchTool.cxx b/InnerDetector/InDetValidation/InDetTruthVertexValidation/Root/InDetVertexTruthMatchTool.cxx
index a570df2f86ebdbbd44dbac22312103b5175842e6..dcc5f3100a88c43e6b9cbe4cd88fc72ee9c54863 100644
--- a/InnerDetector/InDetValidation/InDetTruthVertexValidation/Root/InDetVertexTruthMatchTool.cxx
+++ b/InnerDetector/InDetValidation/InDetTruthVertexValidation/Root/InDetVertexTruthMatchTool.cxx
@@ -44,7 +44,7 @@ namespace {
 // Needed because the track->truth assoc gives us the particles but they don't store event normally
 // Add as decoration to avoid full loop for every track ( this time only once per event )
 // Use a vector so any number of truth event collections can be used at once -- but the pointers need to be valid
-void createTruthMap(std::vector<const xAOD::TruthEventBaseContainer *> truthEventContainers ) {
+void createTruthMap(const std::vector<const xAOD::TruthEventBaseContainer *> & truthEventContainers ) {
 
   static const xAOD::TruthParticle::Decorator<ElementLink<xAOD::TruthEventBaseContainer> > backLinkDecor("TruthEventLink");
 
@@ -70,7 +70,7 @@ void createTruthMap(std::vector<const xAOD::TruthEventBaseContainer *> truthEven
 
 }
 
-void createTrackTruthMap(std::vector<const xAOD::TruthEventBaseContainer *> truthEventContainers,
+void createTrackTruthMap(const std::vector<const xAOD::TruthEventBaseContainer *> & truthEventContainers,
                          const xAOD::TrackParticleContainer & trackParticleContainer,
                          float matchCut)
 {