diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_LoadTools.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_LoadTools.py
index e8474eaf60060e3b631bd42635913fb9418880e7..039fbe5d20833ecbc070233c681536590a8a5101 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_LoadTools.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_LoadTools.py
@@ -130,10 +130,9 @@ def Initiate(ConfInstance=None):
     # -------------- Calibration Broker --------------
     from AthenaCommon.AppMgr import ToolSvc
     from AthenaCommon.Resilience import treatException,protectedInclude
-    if ConfInstance._name == "":
-      print ConfInstance.BTagTag()+' - No calibration broker setup - The condition algorithm is used'
-    elif ConfInstance._name == "Trig":
-      print ConfInstance.BTagTag()+' - No calibration broker setup - The condition algorithm is used'
+    if ConfInstance._name == "" or ConfInstance._name == "Trig":
+      # No calibration broker setup - The condition algorithm is used
+      pass
     elif ConfInstance._name == "AODFix":
       protectedInclude("BTagging/BTagCalibBroker_AODFix_jobOptions.py")
       BTagCalibrationBrokerTool = ConfInstance.getTool("BTagCalibrationBrokerTool")
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
index 06d140171aa687c341e86c84adffa0bcdccada66..02aef493682ea77bfa25f39bf882c60d834f2c93 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondAlg.cxx
@@ -737,9 +737,11 @@ namespace Analysis {
   }
 
   StatusCode JetTagCalibCondAlg::getTObject(const std::string& histname, TFile * pfile, TObject*& hist) const {
-     // now read the histogram into memory
+     // now read the histogram into memor
      ATH_MSG_DEBUG("Getting object "+histname+" from file");
-     pfile->GetObject(histname.c_str(),hist);
+     std::unique_ptr<TObject> hist_raw(pfile->Get(histname.c_str()));
+     hist = dynamic_cast<TObject *>(hist_raw.get());
+     hist_raw.release();
      if (hist==nullptr) {
        ATH_MSG_DEBUG("#BTAG# Could not load TObject " << histname);
        return StatusCode::FAILURE;
diff --git a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondData.cxx b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondData.cxx
index ac5ad67f92e280dfd153a1d87976dd5440dbaa55..4dc531a2f034f5225cc60894dcecb8c7b895312f 100644
--- a/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondData.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagCalibration/src/JetTagCalibCondData.cxx
@@ -61,11 +61,11 @@ void JetTagCalibCondData::addHisto(const unsigned int indexTagger, const std::st
 
 void JetTagCalibCondData::addDL1NN(const std::string&tagger, const std::string& channel, const lwt::JSONConfig& obj) {
   MsgStream log(Athena::getMessageSvc(), "JetTagCalibCondData");
-  log << MSG::WARNING << "#BTAG# JSONConfig in cond data with " << obj.layers.size() << " layers" << endmsg;
-  log << MSG::WARNING << "#BTAG# JSONConfig in cond data for tagger " << tagger << endmsg;
-  log << MSG::WARNING << "#BTAG# JSONConfig in cond data for channel " << channel << endmsg;
+  log << MSG::DEBUG << "#BTAG# JSONConfig in cond data with " << obj.layers.size() << " layers" << endmsg;
+  log << MSG::DEBUG << "#BTAG# JSONConfig in cond data for tagger " << tagger << endmsg;
+  log << MSG::DEBUG << "#BTAG# JSONConfig in cond data for channel " << channel << endmsg;
   m_DL1_NNConfig[tagger].insert(std::make_pair(channel, obj));
-  log << MSG::WARNING << "#BTAG# m_DL1_NNConfig size " << m_DL1_NNConfig.size();
+  log << MSG::DEBUG << "#BTAG# m_DL1_NNConfig size " << m_DL1_NNConfig.size() << endmsg;
 }
 
 void JetTagCalibCondData::addChannelAlias(const std::string& channel, const std::string& alias) {