Some StyleCop warnings fixed