diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
index 3af125a6d67ebfcc7c78bd47ee8a952b2064116b..c83ff3148163652b65d207ed7d83b91db0b36e65 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InDetTrackBiasingTool.cxx
@@ -237,54 +237,54 @@ namespace InDet {
   StatusCode InDetTrackBiasingTool::initHistograms()
   {
 
-    TH2* data15_biasD0Histogram_tmp;
-    TH2* data15_biasZ0Histogram_tmp;
-    TH2* data15_biasQoverPsagittaHistogram_tmp;
-    TH2* data15_biasD0HistError_tmp;
-    TH2* data15_biasZ0HistError_tmp;
-    TH2* data15_biasQoverPsagittaHistError_tmp;
-
-    TH2* data16_1stPart_biasD0Histogram_tmp;
-    TH2* data16_1stPart_biasZ0Histogram_tmp;
-    TH2* data16_1stPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data16_1stPart_biasD0HistError_tmp;
-    TH2* data16_1stPart_biasZ0HistError_tmp;
-    TH2* data16_1stPart_biasQoverPsagittaHistError_tmp;
-
-    TH2* data16_2ndPart_biasD0Histogram_tmp;
-    TH2* data16_2ndPart_biasZ0Histogram_tmp;
-    TH2* data16_2ndPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data16_2ndPart_biasD0HistError_tmp;
-    TH2* data16_2ndPart_biasZ0HistError_tmp;
-    TH2* data16_2ndPart_biasQoverPsagittaHistError_tmp;
-
-    TH2* data17_1stPart_biasD0Histogram_tmp;
-    TH2* data17_1stPart_biasZ0Histogram_tmp;
-    TH2* data17_1stPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data17_1stPart_biasD0HistError_tmp;
-    TH2* data17_1stPart_biasZ0HistError_tmp;
-    TH2* data17_1stPart_biasQoverPsagittaHistError_tmp;
-
-    TH2* data17_2ndPart_biasD0Histogram_tmp;
-    TH2* data17_2ndPart_biasZ0Histogram_tmp;
-    TH2* data17_2ndPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data17_2ndPart_biasD0HistError_tmp;
-    TH2* data17_2ndPart_biasZ0HistError_tmp;
-    TH2* data17_2ndPart_biasQoverPsagittaHistError_tmp;
-
-    TH2* data18_1stPart_biasD0Histogram_tmp;
-    TH2* data18_1stPart_biasZ0Histogram_tmp;
-    TH2* data18_1stPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data18_1stPart_biasD0HistError_tmp;
-    TH2* data18_1stPart_biasZ0HistError_tmp;
-    TH2* data18_1stPart_biasQoverPsagittaHistError_tmp;
-
-    TH2* data18_2ndPart_biasD0Histogram_tmp;
-    TH2* data18_2ndPart_biasZ0Histogram_tmp;
-    TH2* data18_2ndPart_biasQoverPsagittaHistogram_tmp;
-    TH2* data18_2ndPart_biasD0HistError_tmp;
-    TH2* data18_2ndPart_biasZ0HistError_tmp;
-    TH2* data18_2ndPart_biasQoverPsagittaHistError_tmp;
+    TH2* data15_biasD0Histogram_tmp = nullptr;
+    TH2* data15_biasZ0Histogram_tmp = nullptr;
+    TH2* data15_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data15_biasD0HistError_tmp = nullptr;
+    TH2* data15_biasZ0HistError_tmp = nullptr;
+    TH2* data15_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data16_1stPart_biasD0Histogram_tmp = nullptr;
+    TH2* data16_1stPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data16_1stPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data16_1stPart_biasD0HistError_tmp = nullptr;
+    TH2* data16_1stPart_biasZ0HistError_tmp = nullptr;
+    TH2* data16_1stPart_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data16_2ndPart_biasD0Histogram_tmp = nullptr;
+    TH2* data16_2ndPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data16_2ndPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data16_2ndPart_biasD0HistError_tmp = nullptr;
+    TH2* data16_2ndPart_biasZ0HistError_tmp = nullptr;
+    TH2* data16_2ndPart_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data17_1stPart_biasD0Histogram_tmp = nullptr;
+    TH2* data17_1stPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data17_1stPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data17_1stPart_biasD0HistError_tmp = nullptr;
+    TH2* data17_1stPart_biasZ0HistError_tmp = nullptr;
+    TH2* data17_1stPart_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data17_2ndPart_biasD0Histogram_tmp = nullptr;
+    TH2* data17_2ndPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data17_2ndPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data17_2ndPart_biasD0HistError_tmp = nullptr;
+    TH2* data17_2ndPart_biasZ0HistError_tmp = nullptr;
+    TH2* data17_2ndPart_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data18_1stPart_biasD0Histogram_tmp = nullptr;
+    TH2* data18_1stPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data18_1stPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data18_1stPart_biasD0HistError_tmp = nullptr;
+    TH2* data18_1stPart_biasZ0HistError_tmp = nullptr;
+    TH2* data18_1stPart_biasQoverPsagittaHistError_tmp = nullptr;
+
+    TH2* data18_2ndPart_biasD0Histogram_tmp = nullptr;
+    TH2* data18_2ndPart_biasZ0Histogram_tmp = nullptr;
+    TH2* data18_2ndPart_biasQoverPsagittaHistogram_tmp = nullptr;
+    TH2* data18_2ndPart_biasD0HistError_tmp = nullptr;
+    TH2* data18_2ndPart_biasZ0HistError_tmp = nullptr;
+    TH2* data18_2ndPart_biasQoverPsagittaHistError_tmp = nullptr;
 
     ATH_MSG_INFO( "Using for data15 (before 296939) the calibration file " << PathResolverFindCalibFile(m_calibFileData15) );
     ATH_CHECK ( initObject<TH2>(data15_biasD0Histogram_tmp, m_calibFileData15, m_d0_nominal_histName) );
diff --git a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InclusiveTrackFilterTool.cxx b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InclusiveTrackFilterTool.cxx
index 5448053e81b40c69b35c27bb8fbc342e717492a6..92aa88bc3da3ab065dedeb17d96e787b91e02f31 100644
--- a/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InclusiveTrackFilterTool.cxx
+++ b/PhysicsAnalysis/TrackingID/InDetTrackSystematicsTools/Root/InclusiveTrackFilterTool.cxx
@@ -25,7 +25,7 @@ namespace InDet {
 
     m_rnd = std::make_unique<TRandom3>(m_seed);
 
-    TH2* trkLRTEff_tmp;
+    TH2* trkLRTEff_tmp = nullptr;
     ATH_CHECK( initObject<TH2>( trkLRTEff_tmp,
                m_calibFileLRTEff, 
                m_calibHistLRTEff) );