more psr2 fixes