Changes to make it compatible with PHP 5.3