Fixes for PHP 5.4