Fix StyleCop issues