diff --git a/ForwardDetectors/AFP/Run3AFPMonitoring/CMakeLists.txt b/ForwardDetectors/AFP/Run3AFPMonitoring/CMakeLists.txt
index 305c54a39ac7f5139821bf08af64310bc5f68f7f..ef8a35d4926890de675ea94fd823a767dbe9e46c 100644
--- a/ForwardDetectors/AFP/Run3AFPMonitoring/CMakeLists.txt
+++ b/ForwardDetectors/AFP/Run3AFPMonitoring/CMakeLists.txt
@@ -16,6 +16,7 @@ atlas_depends_on_subdirs(
         Control/AthenaMonitoringKernel
         GaudiKernel
 	Event/xAOD/xAODForward
+	xAODForward/AFPSiHit
         LumiBlock/LumiBlockComps
         LumiBlock/LumiBlockData
         Trigger/TrigEvent/TrigDecisionInterface
@@ -80,7 +81,8 @@ atlas_add_component(
         AthenaMonitoringKernelLib
         LumiBlockData
         LWHists
-	xAODForward
+	AFPSiHit
+        xAODForward
         SGAudCore
         TrigDecisionToolLib
 )
@@ -89,5 +91,6 @@ atlas_add_component(
 #atlas_install_python_modules( python/*.py 
 #                              POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py )
 #atlas_install_scripts( share/Run3DQTestingDriver.py share/hist_file_dump.py share/hist_diff.sh )
 
diff --git a/ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h b/ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h
index 0f971d0a98507ff3f79eebd53c49e8efb8b3d09f..c345cbcce3e5df6283359e1233559e65395e1cc7 100644
--- a/ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h
+++ b/ForwardDetectors/AFP/Run3AFPMonitoring/Run3AFPMonitoring/AFPSiLayerAlgorithm.h
@@ -8,8 +8,8 @@
 #include "AthenaMonitoring/AthMonitorAlgorithm.h"
 #include "AthenaMonitoringKernel/Monitored.h"
 #include "StoreGate/ReadHandleKey.h"
-#include <xAODForward/AFPSiHitContainer.h>
-//##include <xAODForward/AFPSiHit.h>
+#include "xAODForward/AFPSiHitContainer.h"
+#include "xAODForward/AFPSiHit.h"
 
 #include "TRandom3.h"
 
diff --git a/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx b/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
index 73c63b3f064421151817d60baf8bd7184dc3fb21..4cb400022e118a55889a12aef6495c71be94f8d3 100644
--- a/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
+++ b/ForwardDetectors/AFP/Run3AFPMonitoring/src/AFPSiLayerAlgorithm.cxx
@@ -145,7 +145,7 @@ StatusCode AFPSiLayerAlgorithm::fillHistograms( const EventContext& ctx ) const
 
     //ATH_CHECK( afpHitContainerKey.initialize() );
 
-    for(const auto& hitsItr: *afpHitContainer)
+    for(const xAOD::AFPSiHit *hitsItr: *afpHitContainer)
     {
 
 	switch(hitsItr->stationID())