Fix PSR2 build issues