Changes to Support PHP 5.3