diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
index 8338c8bbd418df665d4438eef3b2e41af8990a99..0a1cc4360326fb6fa8356163f301088ae02a916b 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_BarrelElement.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -131,12 +131,12 @@ namespace InDetDD {
     const TRT_BarrelElement& operator=(const TRT_BarrelElement& right) = delete;
     /** These transforms are effectively to the local coord
       system of a straw derived from GeoModel -> hence CLHEP */
-    HepGeom::Transform3D calculateStrawTransform(int straw) const;
+    virtual HepGeom::Transform3D calculateStrawTransform(int straw) const override;
     HepGeom::Transform3D calculateLocalStrawTransform(int straw) const;
     /** return the surface of the element */ 
-    const Trk::Surface & elementSurface() const;
+    virtual const Trk::Surface & elementSurface() const override;
     /** create the cache for the element */
-    void createSurfaceCache() const;
+    virtual void createSurfaceCache() const override;
     std::unique_ptr<SurfaceCache> createSurfaceCacheHelper() const;
 
     // Private Member data:
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
index 27fffa85bed58402e28ffc86ac24637c85650a82..0da3d309b493eddb226aabb14d88235a6598d89a 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/TRT_ReadoutGeometry/TRT_EndcapElement.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 ///////////////////////////////////////////////////////////////////
@@ -67,7 +67,7 @@ namespace InDetDD {
       virtual HepGeom::Transform3D defStrawTransform(int straw) const override final;
     
       /** Active straw length */
-      virtual const double & strawLength() const;
+      virtual const double & strawLength() const override;
     
       /** StrawDirection. +1 if axis is in same direction as local coordinate, -1 otherwise. */
       virtual int strawDirection() const override final;
@@ -103,14 +103,14 @@ namespace InDetDD {
     private:
       /** These transforms are effectively to the local coord
         system of a straw derived from GeoModel -> hence CLHEP */
-      HepGeom::Transform3D calculateStrawTransform(int straw) const;
+      virtual HepGeom::Transform3D calculateStrawTransform(int straw) const override;
       HepGeom::Transform3D calculateLocalStrawTransform(int straw) const;
     
       /** return the surface of the element */ 
-      const Trk::Surface & elementSurface() const;
+      virtual const Trk::Surface & elementSurface() const override;
 
       /** create the cache for the element */
-      void createSurfaceCache() const;
+      virtual void createSurfaceCache() const override;
       std::unique_ptr<SurfaceCache> createSurfaceCacheHelper() const;
       /** create the cache for the straw of identifier id */
       void createSurfaceCache(Identifier id) const;
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
index 80e442aedac65df71aa655b4189846a51a9d958e..dd611ab2f1ede6e6fe19ee20ce242ed4ad4ca06d 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_BarrelElement.cxx
@@ -197,7 +197,7 @@ void TRT_BarrelElement::createSurfaceCache() const
 {
  // create the surface cache
  if (!m_surfaceCache) {
-   m_surfaceCache.set(std::move(createSurfaceCacheHelper()));
+   m_surfaceCache.set(createSurfaceCacheHelper());
  }
  // creaete the surface (only if needed, links are still ok even if cache
  // update)
diff --git a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
index 7f13cc04c67238e674d0bfa3b9ed2db28265b229..122ae59933a35c0244ed35951ff4a0837d65a036 100755
--- a/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
+++ b/InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_EndcapElement.cxx
@@ -244,7 +244,7 @@ void
 TRT_EndcapElement::createSurfaceCache() const
 {
  if (!m_surfaceCache) {
-    m_surfaceCache.set(std::move(createSurfaceCacheHelper()));
+    m_surfaceCache.set(createSurfaceCacheHelper());
   }
   // create the surface if needed
   if (!m_surface) {