diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
index 6ec90cd064192d5012e61e1b76f684f652d14b75..52f99e88af8249c5fe1c13de1a7c784a00f4d1b4 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetParticleAssociation.h
@@ -33,7 +33,7 @@ class JetParticleAssociation : public asg::AsgTool {
     private:
         std::string m_outputCollectionName;
         std::string m_jetCollectionName;
-        SG::AuxElement::Decorator<std::vector<ElementLink<xAOD::IParticleContainer> > > *dec;
+        SG::AuxElement::Decorator<std::vector<ElementLink<xAOD::IParticleContainer> > > *m_dec;
 };
 
 #endif
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
index a2e7e5ace1e4b1c0debc087b77ed5d65392d851d..26df4eef542fce227b40353b09940bb400c06425 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/ParticleJetTools/JetQuarkLabel.h
@@ -40,7 +40,6 @@ class JetQuarkLabel : public asg::AsgTool, virtual public IJetTruthMatching {
         JetQuarkLabel(const std::string& name);
         virtual ~JetQuarkLabel();
         virtual StatusCode initialize() override;
-        virtual StatusCode finalize() override;
 
         /* Method to truth tag a jet.
          * NB: for this particular algorithm, matchJet is TRUE if the jet is matched 
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
index 249c007ef0d510452ac488c3ab84dd7208f7eefb..9c20f15bfad0a0b20a03ae526684889d44fd6dc2 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetParticleAssociation.cxx
@@ -19,7 +19,7 @@ JetParticleAssociation::JetParticleAssociation(const string& name)
     }
 
 StatusCode JetParticleAssociation::initialize() {
-    dec = new SG::AuxElement::Decorator<vector<ElementLink<IParticleContainer> > >(m_outputCollectionName);
+    m_dec = new SG::AuxElement::Decorator<vector<ElementLink<IParticleContainer> > >(m_outputCollectionName);
 
     return StatusCode::SUCCESS;
 }
@@ -41,7 +41,7 @@ StatusCode JetParticleAssociation::execute() {
         trkacc("BTagTrackToJetAssociator");
 
     for (unsigned int iJet = 0; iJet < jets->size(); iJet++)
-        (*dec)(*jets->at(iJet)) = (*matches)[iJet];
+        (*m_dec)(*jets->at(iJet)) = (*matches)[iJet];
 
     delete matches;
 
@@ -50,6 +50,6 @@ StatusCode JetParticleAssociation::execute() {
 
 
 StatusCode JetParticleAssociation::finalize() {
-    delete dec;
+    delete m_dec;
     return StatusCode::SUCCESS;
 }
diff --git a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
index cad19fc6543020e1ecfc57773eb08ea45acfdbb6..81aa1b45da6357e8a534bf3efddfd3ce42811502 100644
--- a/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/ParticleJetTools/Root/JetQuarkLabel.cxx
@@ -49,10 +49,6 @@ StatusCode JetQuarkLabel::initialize() {
   return StatusCode::SUCCESS;
 }
 
-StatusCode JetQuarkLabel::finalize() {
-  return StatusCode::SUCCESS;
-}
-
 bool JetQuarkLabel::matchJet(const xAOD::Jet& myJet,
                              MatchInfo* info /*= nullptr*/) const
 {