Some fixes for PHP 5.3 compatability