Update for PHP 5.3 compat