Fix PSR-1 changes