diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
index 1e8d0cbeb2b841e94e0fdbc49e1d2cbd1b0ae65b..dec158e22ba8cb85568e5991d59199ff694d9186 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODCaloClusterRetriever.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "AnalysisJiveXML/AODCaloClusterRetriever.h"
@@ -104,7 +104,7 @@ namespace JiveXML {
       }
     }else {
       //obtain all collections with the given keys
-      std::vector<std::string>::const_iterator keyIter,endIter;
+      std::vector<std::string>::const_iterator keyIter;
       for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
 	StatusCode sc = evtStore()->retrieve( ccc, (*keyIter) );
 	if (!sc.isFailure()) {
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
index 9860a696176bc54c6ba5001d3ee3b4322967a97a..203a6b12bce798827e397a08bc9c15936a1e67ea 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/AODJetRetriever.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "AnalysisJiveXML/AODJetRetriever.h"
@@ -85,7 +85,7 @@ namespace JiveXML {
       }
     }else {
       //obtain all collections with the given keys
-      std::vector<std::string>::const_iterator keyIter,endIter;
+      std::vector<std::string>::const_iterator keyIter;
       for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
         if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG
 	StatusCode sc = evtStore()->retrieve( jets, (*keyIter) );
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
index ea9b56a951c54a47408751b9dfdee01fa3d73de0..ddbdd112682360a3180d53760f37d5a796335f39 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/BJetRetriever.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "AnalysisJiveXML/BJetRetriever.h"
@@ -86,7 +86,7 @@ namespace JiveXML {
       }
     }else {
       //obtain all collections with the given keys
-      std::vector<std::string>::const_iterator keyIter,endIter;
+      std::vector<std::string>::const_iterator keyIter;
       for ( keyIter=m_otherKeys.begin(); keyIter!=m_otherKeys.end(); ++keyIter ){
 	if ( !evtStore()->contains<JetCollection>( (*keyIter) ) ){ continue; } // skip if not in SG
 	StatusCode sc = evtStore()->retrieve( jets, (*keyIter) );
diff --git a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
index 6c9cfe7e43a550418bda3f2e51d86eaea2382fbb..037cc35df8cab68040d510ee6d9d2bbc58fb28e8 100755
--- a/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
+++ b/PhysicsAnalysis/AnalysisEventDisplay/AnalysisJiveXML/src/TruthParticleRetriever.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "AnalysisJiveXML/TruthParticleRetriever.h"
@@ -78,7 +78,7 @@ namespace JiveXML {
      samePdgIdFlag = false;
      initialProcessFlag = false;
      protectedParticleFlag = false;
-     statusList += (*mcpartItr)->status() + "_";
+     statusList += std::to_string((*mcpartItr)->status()) + "_";
 
      if ( (*mcpartItr)->et()/CLHEP::GeV < m_truthPtCut ){ continue; }
 /*