diff --git a/Projects/AthAnalysis/package_filters.txt b/Projects/AthAnalysis/package_filters.txt
index 74f2c61796cbf7a5acac7321c748beb574d54048..bf1cb9aab49439d24a88807a5f46bbd3204c07a2 100644
--- a/Projects/AthAnalysis/package_filters.txt
+++ b/Projects/AthAnalysis/package_filters.txt
@@ -130,6 +130,11 @@
 + Trigger/TrigSteer/TrigCompositeUtils
 + Trigger/TrigT1/TrigT1MuctpiBits
 #+ Trigger/TriggerSimulation/TrigBtagEmulationTool
+# Following packages needed for ConfigFlags.Trigger
++ Trigger/TriggerCommon/TriggerJobOpts
++ Trigger/TrigTools/TrigInDetConfig
++ InnerDetector/InDetConfig
+
 #+ Reconstruction/RecoTools/IsolationTool
 + Reconstruction/RecoTools/RecoToolInterfaces
 
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
index dbff6d35dc523bf3743244c53c88dd219fc9ee2a..138b96631d2a6cf646352d91dde01a1af5840cce 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
@@ -58,13 +58,15 @@ def getTrigDecisionTool(ConfigFlags):
     tdt.NavigationFormat = "TrigComposite" if use_run3_format else "TriggerElement"
     tdt.HLTSummary = getRun3NavigationContainerFromInput(ConfigFlags)
 
-    # This pre-loads libraries required to read the run 2 trigger navigation
-    from TrigEDMConfig.TriggerEDM import EDMLibraries
-    nav = CompFactory.HLT.Navigation('Navigation')
-    nav.Dlls = [e for e in  EDMLibraries if 'TPCnv' not in e]
-    tdt.Navigation = nav
+    # This pre-loads libraries required to read the run 2 trigger navigation. Full-athena only
+    import os
+    if os.environ.get('AtlasProject') == 'Athena':
+        from TrigEDMConfig.TriggerEDM import EDMLibraries
+        nav = CompFactory.HLT.Navigation('Navigation')
+        nav.Dlls = [e for e in  EDMLibraries if 'TPCnv' not in e]
+        tdt.Navigation = nav
+        acc.addPublicTool(nav)
 
-    acc.addPublicTool(nav)
     acc.addPublicTool(tdt, primary=True)
 
     if use_infile_metadata:
diff --git a/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt b/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt
index d53c251ce6713694191c6414b52ec873746ce5a8..35e75e79fa687f1ce9ef697f1aaed0dbcf573887 100644
--- a/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt
+++ b/Trigger/TrigTools/TrigInDetConfig/CMakeLists.txt
@@ -4,7 +4,12 @@
 atlas_subdir( TrigInDetConfig )
 
 # Install files from the package:
+# Split to avoid "Could not locate POST_BUILD_CMD: --extend-extensions XXX"
+if( XAOD_ANALYSIS )
+atlas_install_python_modules( python/*.py )
+else()
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL901 )
+endif()
 
 # Tests in the package:
 atlas_add_test( trigInDetFastTrackingCfg
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
index cb6084c171c200f3578768527948c51756bc553f..d0102f04129fbb6e22cf66d410eb5c8b9fde56f9 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerJobOpts/CMakeLists.txt
@@ -4,9 +4,18 @@
 atlas_subdir( TriggerJobOpts )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
-atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+
+# Split to avoid "Could not locate POST_BUILD_CMD: --extend-extensions XXX"
+if( XAOD_ANALYSIS )
+   atlas_install_python_modules( python/*.py )
+   atlas_install_scripts( test/*.py )
+   atlas_install_joboptions( share/*.py )
+else()
+   atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
+   atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+   atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+endif()
+
 
 atlas_add_test( TriggerConfigFlagsTest
    SCRIPT python -m unittest TriggerJobOpts.TriggerConfigFlags