More PHP 5.3 fixes