diff --git a/grid/yaspgrid.hh b/grid/yaspgrid.hh
index af03e83667b018c9ba075e57797e42f5cd4f9aa5..db03817611ce6bd0cf9191ccb18bb271a5b93694 100644
--- a/grid/yaspgrid.hh
+++ b/grid/yaspgrid.hh
@@ -166,13 +166,7 @@ namespace Dune {
     //! return the element type identifier
     GeometryType type () const
     {
-      switch (mydim)
-      {
-      case 1 : return line;
-      case 2 : return quadrilateral;
-      case 3 : return hexahedron;
-      default : return unknown;
-      }
+      return hypercube;
     }
 
     //! return the number of corners of this element. Corners are numbered 0...n-1
@@ -319,13 +313,7 @@ namespace Dune {
     //! return the element type identifier
     GeometryType type () const
     {
-      switch (mydim)
-      {
-      case 1 : return line;
-      case 2 : return quadrilateral;
-      case 3 : return hexahedron;
-      default : return unknown;
-      }
+      return hypercube;
     }
 
     //! return the number of corners of this element. Corners are numbered 0...n-1
@@ -784,7 +772,7 @@ namespace Dune {
     //! consecutive, codim-wise, level-wise index
     int compressedIndex () const
     {
-      _it.superindex();
+      return _it.superindex();
     }
 
     //! subentity persistent index