Corrections for PHP 5.4