diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 9285ccc8ff8aea09a14648d3a7c6c927b8ca98d8..a6bc9a730c64b4f10ac8ca541d50777e866858cd 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -628,6 +628,11 @@ InDetTrigPixelConditionsSummaryTool = PixelConditionsSetup.summaryTool
 if DetFlags.haveRIO.SCT_on():
   from SCT_ConditionsTools.SCT_ConditionsToolsConf import SCT_ConditionsSummaryTool
   InDetTrigSCTConditionsSummaryTool = SCT_ConditionsSummaryTool(SCT_ConditionsSetup.instanceName('InDetSCT_ConditionsSummaryTool'))
+
+  # Use the HLT version of the flagged cond data - please tell me there's a better way
+  for tool in InDetTrigSCTConditionsSummaryTool.ConditionsTools:
+    if hasattr( tool, "SCT_FlaggedCondData" ):
+      tool.SCT_FlaggedCondData = "SCT_FlaggedCondData_TRIG"
 else:
   InDetTrigSCTConditionsSummaryTool = None
 
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
index e319c4261f9753a7e9031cb9c147b6cf243faf8a..388701c53d11ee207130557e91802b8f5035c437 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/EFIDTracking.py
@@ -47,7 +47,6 @@ def get_idtrig_view_verifier(name):
                                      ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.PixBSErrCacheKey ),
                                      ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTBSErrCacheKey ),
                                      ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTFlaggedCondCacheKey ),
-                                     ( 'IDCInDetBSErrContainer',        'StoreGateSvc+SCT_FlaggedCondData' ),
                                      ( 'IDCInDetBSErrContainer',        'StoreGateSvc+SCT_FlaggedCondData_TRIG' ),
                                      ( 'IDCInDetBSErrContainer',        'StoreGateSvc+SCT_ByteStreamErrs' ),
                                      ( 'IDCInDetBSErrContainer',        'StoreGateSvc+PixelByteStreamErrs' ),
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
index 01aea6e73d8ba6f315facc4c93d9bbfebcab2487..c4efbde30d32af4f0bba6d7f863e0de91e88a781 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCommon.py
@@ -513,9 +513,9 @@ def siCombinatorialTrackFinderTool_builder( name, trackingCuts ):
    DetFlags.ID_setOn()
    
    #Are we happy with these settings?
-   from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool, InDetTrigPatternUpdator
+   from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigSCTConditionsSummaryTool, InDetTrigPatternUpdator, InDetTrigBoundaryCheckTool
    # @TODO ensure that PRD association map is used if usePrdAssociationTool is set ATR-22756
-   
+
    kwargs = {}
    #Prepare default parameter settings for the tool
    kwargs = setDefaults( kwargs,
@@ -546,6 +546,7 @@ def siCombinatorialTrackFinderTool_builder( name, trackingCuts ):
    
    from SiCombinatorialTrackFinderTool_xk.SiCombinatorialTrackFinderTool_xkConf import InDet__SiCombinatorialTrackFinder_xk
    return InDet__SiCombinatorialTrackFinder_xk(name  = name,
+                                               BoundaryCheckTool = InDetTrigBoundaryCheckTool,
                                                **kwargs)
    
 
@@ -684,7 +685,6 @@ def siSPSeededTrackFinder_builder( name, outputTracks, trackingCuts, usePrdAssoc
    siCombinatorialTrackFinderTool = siCombinatorialTrackFinderTool_builder( name         = get_full_name( 'SiCombinatorialTrackFinder', nameSuffix),
                                                                             trackingCuts = trackingCuts)
 
-
    siTrackMakerTool =  siTrackMakerTool_builder( name                       = get_full_name( 'siTrackMaker', nameSuffix),
                                                  siDetElementsRoadMakerTool = siDetectorElementRoadMaker,
                                                  trackFinderTool            = siCombinatorialTrackFinderTool,