diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.cc b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
index 5b97a0ea..00746c15 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.cc
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.cc
@@ -106,11 +106,11 @@ HalfedgeHandle ArrayKernel::handle(const Halfedge& _he) const
   // There are two halfedges stored per edge
   // Get memory position inside edge vector and devide by size of an edge
   // to get the corresponding edge for the requested halfedge
-  unsigned int eh = ( (char*)&_he - (char*)&edges_.front() ) /  sizeof(Edge)  ;
+  size_t eh = ( (char*)&_he - (char*)&edges_.front() ) /  sizeof(Edge)  ;
   assert((&_he == &edges_[eh].halfedges_[0]) ||
          (&_he == &edges_[eh].halfedges_[1]));
   return ((&_he == &edges_[eh].halfedges_[0]) ?
-                    HalfedgeHandle(eh<<1) : HalfedgeHandle((eh<<1)+1));
+                    HalfedgeHandle( int(eh)<<1) : HalfedgeHandle((int(eh)<<1)+1));
 }
 
 EdgeHandle ArrayKernel::handle(const Edge& _e) const
diff --git a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
index ef97df73..a327cb9c 100644
--- a/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
+++ b/src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
@@ -75,7 +75,7 @@ RandomNumberGenerator::RandomNumberGenerator(const size_t _resolution) :
   }
 
   for ( unsigned int i = 0 ; i < iterations_ - 1; ++i ) {
-    maxNum_ *= (RAND_MAX + 1.0);
+    maxNum_ *= (RAND_MAX + 1);
   }
 }