More PHP 5.2 fixes