adjustments for PHP 5.4