diff --git a/zend/base.cpp b/zend/base.cpp
index 8199f527..ae572852 100644
--- a/zend/base.cpp
+++ b/zend/base.cpp
@@ -23,196 +23,196 @@ void Base::__destruct() const
 
 /**
  *  Overridable method that is called to check if a property is set
- * 
+ *
  *  The default implementation does nothing, and the script will fall back
  *  to accessing the regular object properties
- * 
+ *
  *  @param  key
  *  @return bool
  */
 bool Base::__isset(const Php::Value &key) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the unset function can be called
     throw NotImplemented();
 }
 
 /**
  *  Overridable method that is called to set a new property
- * 
+ *
  *  The default implementation does nothing, and the script will fall back
  *  to accessing the regular object properties
- * 
+ *
  *  @param  key
  *  @param  value
  */
 void Base::__set(const Php::Value &key, const Php::Value &value) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the unset function can be called
     throw NotImplemented();
 }
 
 /**
  *  Retrieve a property
- * 
+ *
  *  The default implementation does nothing, and the script will fall back
  *  to accessing the regular object properties
- * 
+ *
  *  @param  key
  *  @return value
  */
 Php::Value Base::__get(const Php::Value &key) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return nullptr;
 }
 
 /**
  *  Remove a member
- * 
+ *
  *  The default implementation does nothing, and the script will fall back
  *  to accessing the regular object properties
- * 
+ *
  *  @param key
  */
 void Base::__unset(const Php::Value &key) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
 }
 
 /**
  *  Call a method
- * 
+ *
  *  This method is called when a method is called from the PHP script that
  *  was not explicitly defined. You can use this to catch variable method
  *  names, or to support all thinkable method names.
- * 
+ *
  *  @param  method      Name of the method that was called
  *  @param  params      The parameters that were passed to the function
  *  @return Value       The return value
  */
 Value Base::__call(const char *method, Parameters &params) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return nullptr;
 }
 
 /**
  *  Call the class as if it was a function
- * 
+ *
  *  This method is called when a an object is used with () operators:
  *  $object(). You can override this method to make objects callable.
- * 
+ *
  *  @param  params      The parameters that were passed to the function
  *  @return Value       The return value
  */
 Value Base::__invoke(Parameters &params) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return nullptr;
 }
 
 /**
  *  Cast the object to a string
- * 
+ *
  *  This method is called when an object is casted to a string, or when
  *  it is used in a string context
- * 
+ *
  *  @return Value       The object as a string
  */
 Value Base::__toString() const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return nullptr;
-}    
+}
 
 /**
  *  Cast the object to an integer
- * 
+ *
  *  This method is called when an object is casted to an integer, or when
  *  it is used in an integer context
- * 
+ *
  *  @return int         Integer value
  */
 Value Base::__toInteger() const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return 0;
 }
 
 /**
  *  Cast the object to a float
- * 
+ *
  *  This method is called when an object is casted to a float, or when it
  *  is used in a float context
- * 
+ *
  *  @return double      Floating point value
  */
 Value Base::__toFloat() const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return 0.0;
 }
 
 /**
  *  Cast the object to a boolean
- * 
+ *
  *  This method is called when an object is casted to a bool, or when it
  *  is used in a boolean context
- * 
+ *
  *  @return bool
  */
 Value Base::__toBool() const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return false;
 }
 
 /**
  *  Compare the object with a different object
- *  
+ *
  *  Check how a different object compares to this object
- * 
+ *
  *  @param  that        Object to compare with
  *  @return int
  */
 int Base::__compare(const Base &that) const
 {
-    // throw an exception that will be caught in the ClassBase class, 
+    // throw an exception that will be caught in the ClassBase class,
     // so that the default implementation of the function can be called
     throw NotImplemented();
-    
+
     // unreachable code
     return 1;
 }
@@ -277,7 +277,7 @@ Php::Value Base::__count(Php::Parameters &params)
     if (countable == nullptr) return 0;
 
     // pass the call to the interface
-    return countable->count();
+    return (int64_t) countable->count();
 }
 
 /**