diff --git a/Reconstruction/Jet/JetRecConfig/CMakeLists.txt b/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
index 5d29ebbb481e3703fb7c4d75f68f031e582d6827..fb87cd5b0f731cb61d26bd1124c7e08c3fe97653 100644
--- a/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
+++ b/Reconstruction/Jet/JetRecConfig/CMakeLists.txt
@@ -4,7 +4,7 @@
 atlas_subdir( JetRecConfig )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( share/JetRecTestCfg.py test/*.sh )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
index 13ec64fcc8605d8c488b0eb4774c3d11c1c90be6..f1c39db7cf1d1b96e0332146d6eb742d07e1d519 100644
--- a/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
+++ b/Reconstruction/Jet/JetRecConfig/python/JetModConfig.py
@@ -91,8 +91,6 @@ def jetModWithAlternateTrk(jetdef, trkopt):
     IMPORTANT : this must be called after instantiateAliases() .
     """
     
-    from JetRecTools.JetRecToolsConfig import trackcollectionmap
-
     def changeJetModSpec( mod ):
         if mod in ['mod:JVT','mod:JVF', 'mod:TrackMoments', 'mod:TrackSumMoments']:
             return mod+':'+trkopt
diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py
index 52750d138d5c5aa7a75ed376efceff5dfdb1195d..9765fedf5cbeba4061fb2bae0903f4b8f730d878 100644
--- a/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py
+++ b/Reconstruction/Jet/JetRecConfig/python/StandardSmallRJets.py
@@ -2,7 +2,6 @@
 
 from JetRecConfig.StandardJetConstits import jetconstitdic as cst
 from .JetDefinition import  JetDefinition
-from xAODBase.xAODType import xAODType
 
 
 
diff --git a/Reconstruction/Jet/JetRecConfig/python/Utilities.py b/Reconstruction/Jet/JetRecConfig/python/Utilities.py
index 9769877e09a9b3830fbd146364fb48c6ac392182..6f1a29cc0d6206912eb0175367254287571d5afc 100644
--- a/Reconstruction/Jet/JetRecConfig/python/Utilities.py
+++ b/Reconstruction/Jet/JetRecConfig/python/Utilities.py
@@ -57,7 +57,7 @@ def make_alias( prop  ):
     def _getter(self):
         return getattr(self,prop,None)
     def _setter(self,v):
-        raise AttributeError("Cannot set alias "+pname+" from "+str(self) )
+        raise AttributeError("Cannot set alias "+prop+" from "+str(self) )
     return property(_getter, _setter)
 
 def listClassLProperties(cls):
diff --git a/Reconstruction/Jet/JetSimTools/CMakeLists.txt b/Reconstruction/Jet/JetSimTools/CMakeLists.txt
index 293ad7b2d40953ccc778da36fe86cca67fcc6454..2ee508790830a8889be93ed751c90ceb8cf8809b 100644
--- a/Reconstruction/Jet/JetSimTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSimTools/CMakeLists.txt
@@ -10,6 +10,6 @@ atlas_add_component( JetSimTools
                      LINK_LIBRARIES AsgTools xAODTruth JetUtils )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
 
diff --git a/Reconstruction/Jet/JetSimTools/python/JetTruthParticleFilterGetter.py b/Reconstruction/Jet/JetSimTools/python/JetTruthParticleFilterGetter.py
index f9c6c57ca2eef6dca108851f64f2f71dd377c8e1..b761cbc0ef2314e3d7ea9748d1fb9d61ac49f7e4 100644
--- a/Reconstruction/Jet/JetSimTools/python/JetTruthParticleFilterGetter.py
+++ b/Reconstruction/Jet/JetSimTools/python/JetTruthParticleFilterGetter.py
@@ -1,11 +1,10 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from JetSimTools.JetSimToolsConf import JetTruthParticleFilter, JetTruthParticleSelectorTool
 
 from JetRec.JetGetters import getStandardInputCollection
 from JetRec.JetAlgConfiguration import checkAndUpdateOptions
 
-from AthenaCommon.SystemOfUnits import *
 from RecExConfig.Configured import Configured
 from AthenaCommon.AlgSequence import AlgSequence
 import logging
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
index d51d10d54139f2a810780c3297b9912f5fb6a53e..3934a9acb45f50be29339c903c250f7f4e0105cc 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/CMakeLists.txt
@@ -37,5 +37,5 @@ atlas_add_dictionary( JetSubStructureMomentToolsDict
    LINK_LIBRARIES JetSubStructureMomentToolsLib )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
diff --git a/Reconstruction/Jet/JetSubStructureMomentTools/python/DefaultTools.py b/Reconstruction/Jet/JetSubStructureMomentTools/python/DefaultTools.py
index 2c17df095bc07c65826fcac26136754a8eb0770a..2d2dde4e1177f94fd4fb039a2cc4d6d3d7f11238 100644
--- a/Reconstruction/Jet/JetSubStructureMomentTools/python/DefaultTools.py
+++ b/Reconstruction/Jet/JetSubStructureMomentTools/python/DefaultTools.py
@@ -10,6 +10,7 @@ from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import Dipolarity
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import PlanarFlowTool
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import KtMassDropTool
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import EnergyCorrelatorTool
+from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import EnergyCorrelatorGeneralizedTool
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import EnergyCorrelatorGeneralizedRatiosTool
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import CenterOfMassShapesTool
 from JetSubStructureMomentTools.JetSubStructureMomentToolsConf import JetPullTool