Bug fixes
Now requires PHP 5.3