Fix PSR issues