diff --git a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
index d41d276f0df466bda0c31f0ca6012461f0431a7d..afa2ef66f3c99426c7b50a4ee719258a5e361d84 100644
--- a/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
+++ b/Reconstruction/tauRecTools/Root/TauCommonCalcVars.cxx
@@ -113,10 +113,8 @@ StatusCode TauCommonCalcVars::execute(xAOD::TauJet& pTau) const {
     double sumWeightedDR2 = 0;
 
     for (const xAOD::TauTrack* tauTrk : tauTracks){
-      // BUG! should consistently use phiIntermediateAxis - will be fixed in a separate MR
-      double deltaR = Tau1P3PKineUtils::deltaR( ( inTrigger() ? pTau.eta() : pTau.etaIntermediateAxis()), pTau.phi(), tauTrk->eta(), tauTrk->phi() );     
-      // will become:
-      // double deltaR = inTrigger() ? pTau.p4().DeltaR(tauTrk->p4()) : pTau.p4(xAOD::TauJetParameters::IntermediateAxis).DeltaR(tauTrk->p4()); 
+
+      double deltaR = inTrigger() ? pTau.p4().DeltaR(tauTrk->p4()) : pTau.p4(xAOD::TauJetParameters::IntermediateAxis).DeltaR(tauTrk->p4());
       
       ptSum += tauTrk->pt();
       sumWeightedDR += deltaR * tauTrk->pt();
diff --git a/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx b/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
index ff5fa8094347dcae034adf5f07fd43c74d0ba5d9..6877ae6ce9378dd28f754dc8e1026ac748c002f8 100644
--- a/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
+++ b/Reconstruction/tauRecTools/src/TauPi0ClusterScaler.cxx
@@ -139,7 +139,7 @@ void TauPi0ClusterScaler::associateHadronicToChargedPFOs(xAOD::TauJet& pTau, xAO
         ATH_MSG_DEBUG("hadPFO " << hadPFOLink.index() 
                       << ", eta: " << (*hadPFOLink)->eta() 
                       << ", phi: " << (*hadPFOLink)->phi() );
-        xAOD::PFO* chargedPFOMatch = 0;
+        xAOD::PFO* chargedPFOMatch = nullptr;
         // assign hadPFO to closest extrapolated chargedPFO track within dR<0.4
         float dRmin = 0.4; 
         for( auto chargedPFO : chargedPFOContainer ){
@@ -239,7 +239,7 @@ void TauPi0ClusterScaler::associateChargedToNeutralPFOs(xAOD::TauJet& pTau, xAOD
                       << ", phi: " << phiCalo );
         
         // assign extrapolated chargedPFO to closest neutralPFO within dR<0.04
-        xAOD::PFO* neutralPFOMatch = 0;
+        xAOD::PFO* neutralPFOMatch = nullptr;
         float dRmin = 0.04; 
         for( auto neutralPFO : neutralPFOContainer ){
             // calculate dR (false means use eta instead of rapidity)
diff --git a/Reconstruction/tauRecTools/src/TauVertexVariables.cxx b/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
index 19586dc894c945b4c23de7e65233b543b36d778d..1fecbc1b0bfbf2615b3c8075effdaf8e320e3d4d 100644
--- a/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
+++ b/Reconstruction/tauRecTools/src/TauVertexVariables.cxx
@@ -115,14 +115,6 @@ StatusCode TauVertexVariables::executeVertexVariables(xAOD::TauJet& pTau, xAOD::
     ATH_MSG_DEBUG("Tau has no tracks");
   }
 
-  float ipSigLeadTrk;
-  float ipZ0SinThetaSigLeadTrk;
-
-  if (pTau.detail(xAOD::TauJetParameters::ipSigLeadTrk, ipSigLeadTrk))
-    ATH_MSG_VERBOSE("IP significance lead track " << ipSigLeadTrk);
-  if (pTau.detail(xAOD::TauJetParameters::ipZ0SinThetaSigLeadTrk, ipZ0SinThetaSigLeadTrk))
-    ATH_MSG_VERBOSE("IP Z0 significance lead track " << ipZ0SinThetaSigLeadTrk);
-
   pTau.setDetail(xAOD::TauJetParameters::trFlightPathSig, (float)(-1111.));
   
   //try to find secondary vertex if more than 1 track and the tau vertex is available
@@ -146,7 +138,7 @@ StatusCode TauVertexVariables::executeVertexVariables(xAOD::TauJet& pTau, xAOD::
 
   // get the starting point for the fit using Trk::Tracks
   const Amg::Vector3D& seedPoint = m_SeedFinder->findSeed(origTracks);
-  ATH_MSG_VERBOSE("seedPoint x/y/perp=" << seedPoint.x() <<  " " << seedPoint.y() << " "<< seedPoint.z() << " " << TMath::Sqrt(seedPoint.x()*seedPoint.x()+seedPoint.y()+seedPoint.y()));
+  ATH_MSG_VERBOSE("seedPoint x/y/perp=" << seedPoint.x() <<  " " << seedPoint.y() << " "<< seedPoint.z() << " " << std::sqrt(seedPoint.x()*seedPoint.x()+seedPoint.y()+seedPoint.y()));
 
   // fitting the vertex itself
   xAOD::Vertex* xAODvertex = m_fitTool->fit(xaodTracks, seedPoint);