PSR-1 and PSR-2 fixes