diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh
index 0dadf24c..7e36a9b1 100644
--- a/src/OpenMesh/Tools/Utils/HeapT.hh
+++ b/src/OpenMesh/Tools/Utils/HeapT.hh
@@ -274,7 +274,7 @@ private:
 
   
   /// Get the entry at index _idx
-  inline HeapEntry entry(unsigned int _idx) const
+  inline HeapEntry entry(size_t _idx) const
   {
     assert(_idx < size());
     return (Base::operator[](_idx));
@@ -282,7 +282,7 @@ private:
 
   
   /// Set entry _h to index _idx and update _h's heap position.
-  inline void entry(unsigned int _idx, HeapEntry _h) 
+  inline void entry(size_t _idx, HeapEntry _h)
   {
     assert(_idx < size());
     Base::operator[](_idx) = _h;
diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT.cc b/src/OpenMesh/Tools/Utils/MeshCheckerT.cc
index c233a750..52edbddc 100644
--- a/src/OpenMesh/Tools/Utils/MeshCheckerT.cc
+++ b/src/OpenMesh/Tools/Utils/MeshCheckerT.cc
@@ -146,7 +146,7 @@ check(unsigned int _targets, std::ostream& _os)
     typename Mesh::ConstHalfedgeIter  h_it(mesh_.halfedges_begin()), 
                                       h_end(mesh_.halfedges_end());
     typename Mesh::HalfedgeHandle     hh, hstart, hhh;
-    unsigned int                      count, n_halfedges = 2*mesh_.n_edges();
+    size_t                            count, n_halfedges = 2*mesh_.n_edges();
 
     for (; h_it != h_end; ++h_it)
     {