Fix incompatibilities with PHP 5.3