More fixes for PHP 5.4