Adjustments for PHP 5.4