Syntax fixes for PHP 5.5