Fixes for PHP 5.2