diff --git a/Common/Options.cpp b/Common/Options.cpp
index c346ba06b73ef5841bf4fdfd1e1595ac5b478b9e..96e44136e1bed86af1dc11f486b50efd1be7e6f4 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -39,6 +39,11 @@
 #include "clippingWindow.h"
 #endif
 
+#if defined(WIN32)
+#undef min
+#undef max
+#endif
+
 // the single static option context
 Context_T CTX;
 
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index a5e77b017ab33ae90776d0c8ba9f3a9b3e7a28b0..4d0737f215f9a6b3773a9ddd1873e16c67267e56 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -359,6 +359,7 @@ double GFaceCompound::curvature(const SPoint2 &param) const
 //   }
 
 //  return curvature(lt->t);
+  return 0.;
 }
 
 double GFaceCompound::curvature(MTriangle *t) const
@@ -370,6 +371,7 @@ double GFaceCompound::curvature(MTriangle *t) const
 		   n1.y(),n2.y(),n3.y(),
 		   n1.z(),n2.z(),n3.z()};
   //  return fabs(t->interpolateDiv (val,0.,0.,0.));
+  return 0.;
 }
 
 GPoint GFaceCompound::point(double par1, double par2) const