Fixed remaining problems with PHP 5.2