diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
index 167c9895cf8af4e08ce2746e4cbdaf9e5d1957c8..72d7bcbed49dc4ea8499a4bffd40f433ab915a0a 100644
--- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
+++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
@@ -589,7 +589,7 @@ void CompositeT<MeshType,RealType>::FVc(Coeff& _coeff)
 
         if (mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it))).is_valid()) {
           cog += mesh_.data(mesh_.face_handle(*voh_it)).position() * c;
-          cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (1.0 - c);
+          cog += mesh_.data(mesh_.face_handle(mesh_.opposite_halfedge_handle(mesh_.next_halfedge_handle(*voh_it)))).position() * (static_cast<typename MeshType::Point::value_type>(1.0) - c);
         } else {
           cog += mesh_.data(mesh_.face_handle(*voh_it)).position();
         }
diff --git a/src/Unittests/unittests_tutorials.cc b/src/Unittests/unittests_tutorials.cc
index b2daf8907f18275394e7b20c372d0dd52a914118..552fa614c83fb2ce46e5a37bea82ca11b8266bdc 100644
--- a/src/Unittests/unittests_tutorials.cc
+++ b/src/Unittests/unittests_tutorials.cc
@@ -57,7 +57,7 @@ struct MyData
   bool operator != (const MyData& _rhs) const { return !(*this == _rhs); }
 };
 
-typedef std::map< std::string, size_t > MyMap;
+typedef std::map< std::string, unsigned int > MyMap;
 
 namespace OpenMesh {
   namespace IO {
@@ -114,7 +114,7 @@ namespace OpenMesh {
           return sizeof(unsigned int);
 
         value_type::const_iterator it = _v.begin();
-        size_t   N     = _v.size();
+        unsigned int   N     = _v.size();
         size_t         bytes = IO::size_of(N);
         for(;it!=_v.end(); ++it)
         {
@@ -128,7 +128,7 @@ namespace OpenMesh {
       size_t store(std::ostream& _os, const value_type& _v, bool _swap=false)
       {
         size_t   bytes = 0;
-        size_t N = _v.size();
+        unsigned int N = _v.size();
         value_type::const_iterator it = _v.begin();
         bytes += IO::store( _os, N, _swap );
         for (; it != _v.end() && _os.good(); ++it)