Bug fixes for PHP 5.2