FIx some StyleCop errors