PSR[0-2] fixes