Fix  PSR2 compatibility issues