psr2 fixes for 2 prior commits