A few more PHP 5.3-compatibility fixes