diff --git a/src/sand-wedge-data/mygrid.cc b/src/sand-wedge-data/mygrid.cc
index 5b9c81926ef1cbd681f8f13ffe3baae627f9215d..bc7c77daf011d97b2b96bfa17ec9e6279fdaa86b 100644
--- a/src/sand-wedge-data/mygrid.cc
+++ b/src/sand-wedge-data/mygrid.cc
@@ -201,9 +201,8 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
   bool needRefine = true;
   while (true) {
     needRefine = false;
-    for (auto it = grid.template leafbegin<0>();
-         it != grid.template leafend<0>(); ++it) {
-      auto const geometry = it->geometry();
+    for (auto &&e : elements(grid.leafGridView())) {
+      auto const geometry = e.geometry();
 
       auto const weakeningRegionDistance =
           distance(weakPatch, geometry, 1e-6 * MyGeometry::lengthScale);
@@ -214,7 +213,7 @@ void refine(Grid &grid, ConvexPolyhedron<LocalVector> const &weakPatch,
         continue;
 
       needRefine = true;
-      grid.mark(1, *it);
+      grid.mark(1, e);
     }
     if (!needRefine)
       break;
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index e89adce903dd295018e282e935a51c34cd4e9040..c8c660ab98be71fd1c68f11bd12a22c707d01018 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -129,9 +129,8 @@ int main(int argc, char *argv[]) {
 
     double minDiameter = std::numeric_limits<double>::infinity();
     double maxDiameter = 0.0;
-    for (auto it = grid->template leafbegin<0>();
-         it != grid->template leafend<0>(); ++it) {
-      auto const geometry = it->geometry();
+    for (auto &&e : elements(grid->leafGridView())) {
+      auto const geometry = e.geometry();
       auto const diam = diameter(geometry);
       minDiameter = std::min(minDiameter, diam);
       maxDiameter = std::max(maxDiameter, diam);
@@ -237,8 +236,8 @@ int main(int argc, char *argv[]) {
     {
       Dune::MultipleCodimMultipleGeomTypeMapper<
           GridView, Dune::MCMGVertexLayout> const vertexMapper(leafView);
-      for (auto it = leafView.begin<dims>(); it != leafView.end<dims>(); ++it)
-        vertexCoordinates[vertexMapper.index(*it)] = geoToPoint(it->geometry());
+      for (auto &&v : vertices(leafView))
+        vertexCoordinates[vertexMapper.index(v)] = geoToPoint(v.geometry());
     }
 
     HDF5Writer<ProgramState<Vector, ScalarVector>,