More StyleCop fixes