PHP 5.3 fixes and style fix.