diff --git a/DDCore/src/ShapeUtilities.cpp b/DDCore/src/ShapeUtilities.cpp
index 6e5cdd4f0..bfe7a1700 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,1)
+	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 a46861b83..1b1a88601 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