Update to include some PSR-2 stuff where not incompatible