Fixing PSR-0, PSR-1 and PSR-2