Some StyleCop fixes