diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
index d4ef16823bc6dacd626dfeb0b3a3bf176e0dbd53..2686f42d8b12f04acbe1682bea6cae45b78f03d4 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/CurvilinearParametersT.h
@@ -122,7 +122,7 @@ namespace Trk
     mutable std::unique_ptr<CurvilinearUVT>  m_curvilinearFrame;  
 
     /** the curvilinear parameters identifier */
-    unsigned int m_cIdentifier;
+    unsigned int m_cIdentifier=0;
   };
 }//end of namespace Trk
 
diff --git a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
index 8897736c254716dd5ed3dfc94cf378f2732ad1e1..5d62f06cc38c78865df7afd8d227ddeaff2d5507 100644
--- a/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
+++ b/Tracking/TrkEvent/TrkParametersBase/TrkParametersBase/ParametersT.icc
@@ -198,7 +198,7 @@ namespace Trk
   // Move constructor
   template<int DIM,class T,class S>
   ParametersT<DIM,T,S>::ParametersT(ParametersT<DIM,T,S>&& rhs):
-    ParametersBase<DIM,T>(std::move(rhs)),
+    ParametersBase<DIM,T>(std::forward<ParametersBase<DIM,T> >(rhs)),
     m_parameters(std::move(rhs.m_parameters)),
     m_covariance(rhs.m_covariance),
     m_position(std::move(rhs.position())),
@@ -219,12 +219,10 @@ namespace Trk
       ParametersBase<DIM,T>::operator=(rhs);
       
       // delete surface
-      if(m_surface && m_surface->isFree())
-	delete m_surface;
+      if(m_surface && m_surface->isFree()) delete m_surface;
       
       // delete the covariance if there
-      if(m_covariance)
-	delete m_covariance;
+      if(m_covariance) delete m_covariance;
     
       // now assign
       m_parameters = rhs.m_parameters;
@@ -246,11 +244,9 @@ namespace Trk
     {
       ParametersBase<DIM,T>::operator=(std::move(rhs));
 
-      if(m_surface && m_surface->isFree())
-	delete m_surface;
+      if(m_surface && m_surface->isFree()) delete m_surface;
       
-      if(m_covariance)
-	delete m_covariance;
+      if(m_covariance) delete m_covariance;
 
       m_parameters = std::move(rhs.m_parameters);
       m_covariance = rhs.m_covariance;
@@ -350,8 +346,8 @@ namespace Trk
     
     // compare covariance 
     if(((covariance() != 0) &&
-	(pCasted->covariance() != 0) &&
-	!covariance()->isApprox(*pCasted->covariance(),tolerance))
+	     (pCasted->covariance() != 0) &&
+	     !covariance()->isApprox(*pCasted->covariance(),tolerance))
        || (!covariance() != !pCasted->covariance()))  // <-- this is: covariance() XOR pCast->covariance()
       return false;