Fix StyleCop and CA