diff --git a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
index 072c141f83bff89a8e27599fb9405e562cc55915..8fffd7c08503b260b82128fb417474dd87753681 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
+++ b/Tracking/TrkDetDescr/TrkGeometry/TrkGeometry/TrackingVolume.h
@@ -410,10 +410,10 @@ namespace Trk {
       void moveTV ATLAS_NOT_THREAD_SAFE(Amg::Transform3D& transform) const;
            
       /** Forbidden copy constructor */   
-      TrackingVolume(const TrackingVolume&): Volume(), Material() {} 
+      TrackingVolume(const TrackingVolume&) = delete;
 
       /** Forbid assignment. */
-      TrackingVolume &operator=(const TrackingVolume&) { return *this; }
+      TrackingVolume &operator=(const TrackingVolume&) = delete;
        
       const TrackingVolume*        m_motherVolume;  //!< mother volume of this volume
 
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
index ca7aa4626addc56e7b193b7bd045fd44edccdfab..730fe2bc5a881889faff74c857fc913207a3b1c2 100644
--- a/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/CompoundLayerMaterial.cxx
@@ -13,9 +13,9 @@ Trk::CompoundLayerMaterial::CompoundLayerMaterial() :
   Trk::LayerMaterialProperties(),
   m_materialProperties(new Trk::MaterialProperties()),
   m_binUtility(nullptr),
-  m_fullComposition(false)
+  m_fullComposition(false),
+  m_elementTable (Trk::SharedObject<const Trk::ElementTable>(nullptr))
 {
-    m_elementTable = Trk::SharedObject<const Trk::ElementTable>(nullptr);
 }
 
 Trk::CompoundLayerMaterial::CompoundLayerMaterial(const Trk::BinUtility& binutility,
diff --git a/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx b/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
index 03df945f5755486e71ef66cfe65b10e84860f66d..cbdde4c2ebd1755d9df78a7ec499a8ff85d19f90 100755
--- a/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
+++ b/Tracking/TrkDetDescr/TrkGeometry/src/Layer.cxx
@@ -118,6 +118,7 @@ Trk::Layer& Trk::Layer::operator=(const Trk::Layer& lay)
   if (this != &lay){
     delete m_overlapDescriptor;
     delete m_surfaceArray;
+    m_layerThickness                    = lay.m_layerThickness;
     m_enclosingTrackingVolume           = lay.m_enclosingTrackingVolume;
     m_enclosingDetachedTrackingVolume   = lay.m_enclosingDetachedTrackingVolume;
     m_overlapDescriptor                 = (lay.m_overlapDescriptor) ? lay.m_overlapDescriptor->clone() : nullptr;