Minor fixes for PHP 5.