More PSR2 fixes