diff --git a/Control/AthenaMonitoring/python/DQMonFlags.py b/Control/AthenaMonitoring/python/DQMonFlags.py
index 8e600e918b4401ea986a65d170219e1fcd0910c0..fba3359c0815b79083e26dd3c81ef11e7df2d408 100644
--- a/Control/AthenaMonitoring/python/DQMonFlags.py
+++ b/Control/AthenaMonitoring/python/DQMonFlags.py
@@ -223,6 +223,13 @@ class doLucidMon(JobProperty):
     StoredValue=True
 list+=[doLucidMon]
 
+class doAFPMon(JobProperty):
+    """Switch for AFP monitoring"""
+    statusOn=True
+    allowedTypes=['bool']
+    StoredValue=False
+list+=[doAFPMon]
+
 class doHIMon(JobProperty):
     """ Switch for dedicated Heavy Ion monitoring """
     statusOn=True
diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index cac005f471c860a028fdae39041d918cc39a2d19..57d87b85bb61400dbdc9d75b2ae58ab3b7131e19 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -218,6 +218,16 @@ if DQMonFlags.doMonitoring():
       except Exception:
          treatException("DataQualitySteering_jobOptions.py: exception when setting up LUCID monitoring")
 
+   #------------------#                                                                                                                       
+   # AFP monitoring   #                                                                                                                       
+   #------------------#                                                                                                                       
+   if DQMonFlags.doAFPMon():
+      try:
+         include("AFP_Monitoring/AFPMonitoring_jobOptions.py")
+      except Exception:
+         treatException("DataQualitySteering_jobOptions.py: exception when setting up AFP monitoring")
+
+
    #---------------------#
    # HeavyIon monitoring #
    #---------------------#
diff --git a/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py b/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
index 3f329cd3a3cc765073e8df3f8cbdd8ec8205ab30..2f25b8fe05165fcc3b9d16d28ebb08aeb06389a4 100644
--- a/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
+++ b/Control/AthenaMonitoring/share/TrigDecTool_jobOptions.py
@@ -21,6 +21,7 @@ if DQMonFlags.useTrigger():
          cfg = TriggerConfigGetter()
 
    if not hasattr(ToolSvc, DQMonFlags.nameTrigDecTool().split('/')[-1]):
+      tdt_local_logger.error('DQ Monitoring is being asked to set up the TrigDecisionTool for some reason.  THIS IS A TERRIBLE IDEA AND SHOULD BE CONSIDERED A BUG!')
       from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
       monTrigDecTool = Trig__TrigDecisionTool(name=DQMonFlags.nameTrigDecTool(),
                                               OutputLevel=ERROR,
@@ -30,6 +31,12 @@ if DQMonFlags.useTrigger():
                                                                   }
                                              )
       ToolSvc += monTrigDecTool
+      # The following should be provided automatically when setting up the tool, but is not
+      # Still needs to be provided by the trigger
+      # When trigger has a standard procedure for this, switch
+      ToolSvc.TrigDecisionTool.TrigConfigSvc = "Trig::TrigConfigSvc/TrigConfigSvc"
+      from TrigEDMConfig.TriggerEDM import EDMLibraries
+      ToolSvc.TrigDecisionTool.Navigation.Dlls = [e for e in  EDMLibraries if 'TPCnv' not in e]
    else:
       monTrigDecTool = getattr(ToolSvc, DQMonFlags.nameTrigDecTool().split('/')[-1])
    tdt_local_logger.info('Scheduled monitoring TDT %s', monTrigDecTool)