Final fixes for PHP 5.3 compatibility