Fix issues with PHP 55 pull request