diff --git a/DDCore/src/ShapeUtilities.cpp b/DDCore/src/ShapeUtilities.cpp
index 6e5cdd4f045ff492a25467de9e079330ed58e453..e8014a2e0ec200f799621b233b73a7c31318fd7b 100644
--- a/DDCore/src/ShapeUtilities.cpp
+++ b/DDCore/src/ShapeUtilities.cpp
@@ -433,8 +433,14 @@ namespace dd4hep {
     for(int i=0; i<num_facet; ++i)  {
       const TGeoFacet& f = sh->GetFacet(i);
       pars.emplace_back(double(f.GetNvert()));
-      for(int j=0, n=f.GetNvert(); j<n; ++j)
+      for(int j=0, n=f.GetNvert(); j<n; ++j)   {
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,31,0)
+	int idx = f[j];
+        pars.emplace_back(double(idx));
+#else
         pars.emplace_back(double(f.GetVertexIndex(j)));
+#endif
+      }
     }
     return pars;
   }
diff --git a/DDCore/src/Volumes.cpp b/DDCore/src/Volumes.cpp
index a46861b83139de3a6d04f654a54a0492795d66ea..1b1a88601e7bbdf9c3621535af03a60eeb26d3df 100644
--- a/DDCore/src/Volumes.cpp
+++ b/DDCore/src/Volumes.cpp
@@ -361,9 +361,8 @@ PlacedVolumeExtension::PlacedVolumeExtension()
 
 /// Default move
 PlacedVolumeExtension::PlacedVolumeExtension(PlacedVolumeExtension&& c)
-  : TGeoExtension(c), magic(move(c.magic)), refCount(0), volIDs() {
+  : TGeoExtension(c), magic(std::move(c.magic)), refCount(0), volIDs(std::move(c.volIDs)) {
   INCREMENT_COUNTER;
-  volIDs = move(c.volIDs);
 }
 
 /// Copy constructor