StyleCop code complaint fixes