More bug fixes for PHP 5.2