diff --git a/grid/albertagrid/albertagrid.cc b/grid/albertagrid/albertagrid.cc
index 8e9ba3e4755d6fe81ed4cb4de3034ca43e2c37ab..6ed48b1a13b80a8f5219fe8e8b2a3efdb97720fd 100644
--- a/grid/albertagrid/albertagrid.cc
+++ b/grid/albertagrid/albertagrid.cc
@@ -1506,6 +1506,7 @@ namespace Dune
   template<int codim, class GridImp >
   inline AlbertaGridEntityPointer<codim,GridImp> :: ~AlbertaGridEntityPointer()
   {
+    this->done();
     grid_.template freeEntity<codim>( entity_ );
     entityImp_ = 0;
   }
@@ -1944,7 +1945,7 @@ namespace Dune
   {
     builtNeigh_ = false;
     // is like go to the next neighbour
-    neighborCount_++;
+    ++neighborCount_;
 
     // (dim+1) is neigbourCount for end iterators
     if(neighborCount_ > dim)