diff --git a/Examples/test-suite/nested_in_template.i b/Examples/test-suite/nested_in_template.i
index 2e79fa574..81d5b6289 100644
--- a/Examples/test-suite/nested_in_template.i
+++ b/Examples/test-suite/nested_in_template.i
@@ -19,7 +19,7 @@ struct OuterTemplate<1>
 
   struct ConcreteDerived : AbstractBase
   {
-    ConcreteDerived() : m_value(0.) {}
+    ConcreteDerived() : m_value(0) {}
     explicit ConcreteDerived(int value) : m_value(value) {}
 
     virtual bool IsSameAs(const AbstractBase& other) const {
diff --git a/Examples/test-suite/python_pybuffer.i b/Examples/test-suite/python_pybuffer.i
index b46d8c36a..bff72bfa2 100644
--- a/Examples/test-suite/python_pybuffer.i
+++ b/Examples/test-suite/python_pybuffer.i
@@ -28,7 +28,7 @@
         ++count;
     return count;
   }
-  int func4(const char *buf4)
+  size_t func4(const char *buf4)
   {
     return strlen(buf4);
   }  
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
index 9ffc00592..21392cc2e 100755
--- a/Source/Modules/python.cxx
+++ b/Source/Modules/python.cxx
@@ -2224,7 +2224,7 @@ public:
       n = nn;
 
     Parm *parms = Getattr(n, "parms");
-    bool varargs = parms ? emit_isvarargs(parms) : 0;
+    int varargs = parms ? emit_isvarargs(parms) : 0;
 
     /* We prefer to explicitly list all parameters of the C function in the
        generated Python code as this makes the function more convenient to use,