Fix some StyleCop warnings