Fix some new stylecop problems