Fix some StyleCop issues