diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py
index 86498e3d9b76cfbc849c40cfc6ff94ab2c963a4f..4958ce8889cf0a2f829391d3cca6514ff511220f 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/python/InDetAlignmentMonitoringRun3Config.py
@@ -39,7 +39,7 @@ def InDetAlignmentMonitoringRun3Config(flags):
         inDetAlignMonGenericTracksAlg.TrackSelectionTool.minNInnermostLayerHits      = 1
         inDetAlignMonGenericTracksAlg.TrackSelectionTool.minPt                       = 5000
         inDetAlignMonGenericTracksAlg.TrackSelectionTool.maxD0                       = 100000 
-        inDetAlignMonGenericTracksAlg.TrackSelectionTool.maxZ0SinTheta               = 150 
+        inDetAlignMonGenericTracksAlg.TrackSelectionTool.maxZ0SinTheta               = 150
         IDAlignMonGenericTracksAlgCfg(helper, inDetAlignMonGenericTracksAlg, **kwargsIDAlignMonGenericTracksAlg)
         
         ########### here ends InDetAlignMonGenericTracksAlg ###########
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
index 5d7704183f2aee87be18130479f3560490758a89..0230dc4d97d95a5856d0fc18dcfbba2f25cb3004 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.cxx
@@ -11,11 +11,6 @@
 //main header
 #include "IDAlignMonGenericTracksAlg.h"
 
-#include <cmath>
-#include "TMath.h"
-
-#include "GaudiKernel/MsgStream.h"
-
 #include "AtlasDetDescr/AtlasDetectorID.h"
 #include "InDetIdentifier/PixelID.h"
 #include "InDetIdentifier/SCT_ID.h"
@@ -35,6 +30,8 @@
 
 #include "InDetAlignGenTools/IInDetAlignHitQualSelTool.h"
 
+#include <cmath>
+
 // *********************************************************************
 // Public Methods
 // *********************************************************************
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
index 5d573f58c189b2d35bf1be99d98d689f96cd5d5e..3aa15c7378a316f3a4e125431d1e6f00fce69c5e 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoringRun3/src/IDAlignMonGenericTracksAlg.h
@@ -37,8 +37,8 @@
 #include "TrkTrackSummary/TrackSummary.h"
 #include "TrkToolInterfaces/ITrackSummaryTool.h"
 
-#include <vector>
 #include <map>
+#include <string>
 
 class AtlasDetectorID;
 class PixelID;
@@ -71,20 +71,20 @@ private:
   static const Trk::Track*   getTrkTrack(const Trk::VxTrackAtVertex*);
   const xAOD::Vertex* findAssociatedVertexTP(const std::map<const xAOD::TrackParticle*, const xAOD::Vertex*>& trackVertexMapTP, const xAOD::TrackParticle *) const;
 
-  const AtlasDetectorID*                m_idHelper;
-  const PixelID*                        m_pixelID;
-  const SCT_ID*                         m_sctID; 
-  const TRT_ID*                         m_trtID; 
+  const AtlasDetectorID*                m_idHelper{};
+  const PixelID*                        m_pixelID{};
+  const SCT_ID*                         m_sctID{}; 
+  const TRT_ID*                         m_trtID{}; 
   
-  bool  m_extendedPlots;
-  float m_d0Range;
-  float m_d0BsRange;
-  float m_pTRange = 0.0F;
-  float m_z0Range;
-  float m_etaRange;
-  int   m_NTracksRange;
-  bool  m_doIP;
-  bool  m_doHitQuality = false;
+  bool  m_extendedPlots{};
+  float m_d0Range{};
+  float m_d0BsRange{};
+  float m_pTRange{0.0F};
+  float m_z0Range{};
+  float m_etaRange{};
+  int   m_NTracksRange{};
+  bool  m_doIP{};
+  bool  m_doHitQuality{false};
   
   SG::ReadHandleKey<xAOD::VertexContainer> m_VxPrimContainerName{this,"vxPrimContainerName","PrimaryVertices","Primary Vertices for Alignment Monitoring"};
   SG::ReadHandleKey<TrackCollection> m_tracksKey  {this, "TrackName", "ExtendedTracks", "track data key"};
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
index 3e6d192cdb07c3858f7ab160c7055e36c02f51d4..4ca4f7fe7408f85971d445234175cde982b57538 100644
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/python/AtlasTrackingGeometrySvc.py
@@ -42,7 +42,12 @@ class ConfiguredTrackingGeometrySvc( Trk__TrackingGeometrySvc ) :
         #################################################################################
         
         # the name to register the Geometry
-        AtlasTrackingGeometryName = 'AtlasTrackingGeometry'
+        from InDetRecExample.TrackingCommon import use_tracking_geometry_cond_alg
+        # previously set to 'AtlasTrackingGeometry', now defaulted to empty string to
+        # trigger the use of the condAlg in place of this service
+        AtlasTrackingGeometryName = ''
+        if not use_tracking_geometry_cond_alg :
+          AtlasTrackingGeometryName = 'AtlasTrackingGeometry'
         
         # the geometry builder alg tool
         from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__GeometryBuilder
diff --git a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/TrackingGeometrySvc.cxx b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/TrackingGeometrySvc.cxx
index 64d8786061edd223c074f074159f4b426d9d3abf..ebb1e6d7cf1bf7602984f7fc574817bcef9fdad0 100755
--- a/Tracking/TrkDetDescr/TrkDetDescrSvc/src/TrackingGeometrySvc.cxx
+++ b/Tracking/TrkDetDescr/TrkDetDescrSvc/src/TrackingGeometrySvc.cxx
@@ -188,6 +188,7 @@ StatusCode Trk::TrackingGeometrySvc::trackingGeometryInit(bool needsInit)
 }
 
 void Trk::TrackingGeometrySvc::setTrackingGeometry(const Trk::TrackingGeometry *ptr) {
+   ATH_MSG_WARNING("Please use the GeometryConditions Algorithm instead of this service!");
    if (!m_useConditionsData) {
       ATH_MSG_FATAL("Logic error:  external TrackingGeometry provided despite being configured to build an internal one.");
    }