More PHP 5.2 bug fixes