More PHP 5.4 fixes.