psr2 fixes to prior 2 commits