Fixing PHP 5.3 bugs