More PHP 5.3 compability fixes.