PSR-0 and PSR-2 fixes