Fix PSR-2 incompatibilities