Fixes for PHP 5.3