diff --git a/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h b/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
index 1a2fcdc67cccb6013f2912bb422d29699a866f6b..cbe92ee49e9f5f062f1653d1043d4e10842e6502 100755
--- a/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
+++ b/Calorimeter/CaloTrackingGeometry/CaloTrackingGeometry/CaloSurfaceBuilder.h
@@ -166,7 +166,7 @@ private:
   // Defines the depths for DD and User surfaces : 
   ToolHandle<CaloDepthTool>                     m_calodepth;
  
-  ToolHandle<Trk::ITrackingVolumeBuilder>       m_tileVolumeBuilder;             //!< Volume Builder for the Tile Calorimeter
+  //ToolHandle<Trk::ITrackingVolumeBuilder>       m_tileVolumeBuilder;             //!< Volume Builder for the Tile Calorimeter
 
 
   //IToolSvc* m_toolsvc;
diff --git a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
index f44843132c55621130f8f833fc116a418cbbcdac..a8164e741ec3ac409fac33858c5e42f80f279c47 100755
--- a/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
+++ b/Calorimeter/CaloTrackingGeometry/src/CaloSurfaceBuilder.cxx
@@ -69,8 +69,8 @@ CaloSurfaceBuilder::CaloSurfaceBuilder(const std::string& type,
   m_tile_dd(nullptr),
   m_lar_mat("LArRecoMaterialTool"),
   m_lar_simplegeom("LArRecoSimpleGeomTool"),
-  m_calodepth("CaloDepthTool"),
-  m_tileVolumeBuilder("Tile::TileVolumeBuilder/TileVolumeBuilder")
+  m_calodepth("CaloDepthTool")
+  //m_tileVolumeBuilder("Tile::TileVolumeBuilder/TileVolumeBuilder")
 {
   declareInterface<ICaloSurfaceBuilder>( this );
 
@@ -78,7 +78,7 @@ CaloSurfaceBuilder::CaloSurfaceBuilder(const std::string& type,
   declareProperty ("LArRecoMaterialTool",       m_lar_mat);
   declareProperty ("LarRecoSimpleGeometryTool", m_lar_simplegeom);
   declareProperty ("CaloDepthTool",             m_calodepth);
-  declareProperty ("TileVolumeBuilder",         m_tileVolumeBuilder);
+  //declareProperty ("TileVolumeBuilder",         m_tileVolumeBuilder);
 
 }
 
diff --git a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
index 6bee4382dbf17f4ea1ff687b9ececcc5c35e92de..ec23ec2e177cbb1e6443569b81bce9ffb9c7c61a 100644
--- a/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTrackSelectionTool/Root/InDetTrackSelectionTool.cxx
@@ -213,6 +213,10 @@ StatusCode InDet::InDetTrackSelectionTool::initialize() {
     ATH_CHECK( m_extrapolator.retrieve() );
     ATH_MSG_INFO( "Retrieved tool " << m_extrapolator );
   }
+  else {
+    m_trackSumTool.disable();
+    m_extrapolator.disable();
+  }
 #endif // XAOD_ANALYSIS
 
   // local helper functions to determine if a maximum cut should be set.
diff --git a/InnerDetector/InDetRecTools/SiClusterizationTool/src/SCT_ClusteringTool.cxx b/InnerDetector/InDetRecTools/SiClusterizationTool/src/SCT_ClusteringTool.cxx
index d2350897d3065edd651e61b4e3d2266baff18b8b..8d71099617e6ebdf0ab056ce47a2bfdfe4432a89 100644
--- a/InnerDetector/InDetRecTools/SiClusterizationTool/src/SCT_ClusteringTool.cxx
+++ b/InnerDetector/InDetRecTools/SiClusterizationTool/src/SCT_ClusteringTool.cxx
@@ -147,6 +147,8 @@ namespace InDet{
     ATH_MSG_INFO("Initialize clustering tool");
     static const StatusCode fail(StatusCode::FAILURE);
 
+    ATH_CHECK(m_clusterMaker.retrieve());
+
 
     if (m_checkBadChannels){
       ATH_MSG_INFO("Clustering has been asked to look at bad channel info");
diff --git a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
index 9fc393384f9b0fa3218e33f83b64b4cb17e803df..d2a27660450386a1c7c01be7141125d7ceba2cf6 100755
--- a/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
+++ b/InnerDetector/InDetRecTools/SiTrackMakerTool_xk/src/SiTrackMaker_xk.cxx
@@ -181,6 +181,9 @@ StatusCode InDet::SiTrackMaker_xk::initialize()
       msg(MSG::INFO) << "Retrieved tool " << m_seedtrack << endmsg;
     }
   }
+  else {
+    m_seedtrack.disable();
+  }
 
   m_heavyion = false;
 
diff --git a/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx b/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
index 1930b8eb1e7ba91b05a75417c418b0053ea54355..78b9f7e5ef6cc51acb8f1d6634674d7c8a7d96f7 100755
--- a/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
+++ b/Tracking/TrkExtrapolation/TrkExTools/src/MaterialEffectsUpdator.cxx
@@ -105,6 +105,9 @@ Trk::MaterialEffectsUpdator::initialize() {
       ATH_MSG_DEBUG("Retrieved tool " << m_eLossUpdator);
     }
   }
+  else {
+    m_eLossUpdator.disable();
+  }
 
   if (m_doMs) {
     if (m_msUpdator.retrieve().isFailure()) {
@@ -116,6 +119,9 @@ Trk::MaterialEffectsUpdator::initialize() {
       ATH_MSG_DEBUG("Retrieved tool " << m_msUpdator);
     }
   }
+  else {
+    m_msUpdator.disable();
+  }
 
   // retrieve the material mapper for the validation mode
   if (m_validationMode) {
@@ -126,6 +132,9 @@ Trk::MaterialEffectsUpdator::initialize() {
       ATH_MSG_DEBUG("Retrieved tool " << m_materialMapper);
     }
   }
+  else {
+    m_materialMapper.disable();
+  }
 
   return StatusCode::SUCCESS;
 }