psr2 fixes for prior commit