diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
index 9cc470d2..041c20fb 100644
--- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
+++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
@@ -268,9 +268,9 @@ void SubdivideWidget::keyPressEvent( QKeyEvent *k )
 
 void SubdivideWidget::update()
 {
-  unsigned int n_faces = viewer_widget_->mesh().n_faces();
-  unsigned int n_edges = viewer_widget_->mesh().n_edges();
-  unsigned int n_vertices = viewer_widget_->mesh().n_vertices();
+  size_t n_faces = viewer_widget_->mesh().n_faces();
+  size_t n_edges = viewer_widget_->mesh().n_edges();
+  size_t n_vertices = viewer_widget_->mesh().n_vertices();
   QString message(""), temp;
   message.append(temp.setNum(n_faces));
   message.append(" Faces, ");
diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc
index ed758fc0..ccb657e4 100644
--- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc
+++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc
@@ -102,7 +102,7 @@ void ModAspectRatioT<MeshT>::initialize() {
     typename Mesh::Point& p1 = mesh_.point(*(++fv_it));
     typename Mesh::Point& p2 = mesh_.point(*(++fv_it));
 
-    mesh_.property(aspect_, *f_it) = 1.0 / aspectRatio(p0, p1, p2);
+    mesh_.property(aspect_, *f_it) = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(p0, p1, p2);
   }
 }
 
@@ -121,7 +121,7 @@ void ModAspectRatioT<MeshT>::preprocess_collapse(const CollapseInfo& _ci) {
       typename Mesh::Point& p1 = mesh_.point(*(++fv_it));
       typename Mesh::Point& p2 = mesh_.point(*(++fv_it));
 
-      mesh_.property(aspect_, fh) = 1.0 / aspectRatio(p0, p1, p2);
+      mesh_.property(aspect_, fh) = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(p0, p1, p2);
     }
   }
 }
@@ -157,7 +157,7 @@ float ModAspectRatioT<MeshT>::collapse_priority(const CollapseInfo& _ci) {
 
       // aspect after
       if (!(v2 == _ci.v1 || v3 == _ci.v1))
-        if ((r1 = 1.0 / aspectRatio(*p1, *p2, *p3)) < r1_min)
+        if ((r1 = static_cast<typename Mesh::Scalar>(1.0) / aspectRatio(*p1, *p2, *p3)) < r1_min)
           r1_min = r1;
     }
   }
diff --git a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
index 3354d553..759ed87b 100644
--- a/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
+++ b/src/OpenMesh/Tools/Decimater/ModNormalDeviationT.hh
@@ -134,7 +134,7 @@ public:
 
   /// Set normal deviation ( 0 .. 360 )
   void set_normal_deviation(Scalar _s) {
-    normal_deviation_ = _s / 180.0 * M_PI;
+    normal_deviation_ = _s / static_cast<Scalar>(180.0) * static_cast<Scalar>(M_PI);
   }
 
 
@@ -207,7 +207,7 @@ public:
       // the smaller the factor, the smaller normal_deviation_ gets
       // thus creating a stricter constraint
       // division by error_tolerance_factor_ is for normalization
-      Scalar normal_deviation = (normal_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
+      Scalar normal_deviation = (normal_deviation_ * static_cast<Scalar>(180.0)/static_cast<Scalar>(M_PI) ) * _factor / this->error_tolerance_factor_;
       set_normal_deviation(normal_deviation);
       this->error_tolerance_factor_ = _factor;
     }
diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
index 0edd26d9..cedf1b8a 100644
--- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
+++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
@@ -166,12 +166,12 @@ compute_new_positions_C1()
       for (voh_it = Base::mesh_.cvoh_iter(*v_it); voh_it.is_valid(); ++voh_it) {
         w  = this->weight(Base::mesh_.edge_handle(*voh_it));
         uu   -= Base::mesh_.property(umbrellas_, Base::mesh_.to_vertex_handle(*voh_it));
-        diag += (w * this->weight(Base::mesh_.to_vertex_handle(*voh_it)) + 1.0) * w;
+        diag += (w * this->weight(Base::mesh_.to_vertex_handle(*voh_it)) + static_cast<typename Mesh::Scalar>(1.0) ) * w;
       }
       uu   *= this->weight(*v_it);
       diag *= this->weight(*v_it);
       uu   += Base::mesh_.property(umbrellas_, *v_it);
-      if (diag) uu *= 1.0/diag;
+      if (diag) uu *= static_cast<typename Mesh::Scalar>(1.0) / diag;
 
       // damping
       uu *= 0.25;
diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc
index e6152ec8..7c7db692 100644
--- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc
+++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc
@@ -184,13 +184,13 @@ compute_weights(LaplaceWeighting _weighting)
         p2     = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2));
         d0     = (*p0 - *p2); d0.normalize();
         d1     = (*p1 - *p2); d1.normalize();
-        weight += 1.0 / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) ))));
+        weight += static_cast<typename Mesh::Scalar>(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) ))));
 
         heh2   = Base::mesh_.next_halfedge_handle(heh1);
         p2     = &Base::mesh_.point(Base::mesh_.to_vertex_handle(heh2));
         d0     = (*p0 - *p2); d0.normalize();
         d1     = (*p1 - *p2); d1.normalize();
-        weight += 1.0 / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) ))));
+        weight += static_cast<typename Mesh::Scalar>(1.0) / tan(acos(std::max(lb, std::min(ub, dot(d0,d1) ))));
 
         Base::mesh_.property(edge_weights_, *e_it) = weight;
         Base::mesh_.property(vertex_weights_, v0)  += weight;
@@ -208,7 +208,7 @@ compute_weights(LaplaceWeighting _weighting)
   {
     weight = Base::mesh_.property(vertex_weights_, *v_it);
     if (weight)
-      Base::mesh_.property(vertex_weights_, *v_it) = 1.0 / weight;
+      Base::mesh_.property(vertex_weights_, *v_it) = static_cast<typename Mesh::Scalar>(1.0) / weight;
   }
 }