More PHP 5.6 fixes