Additional PHP 5.3 bugfixes