psr-1/2 fixes