psr2 fixes to prior commit