Fix some issues reported by StyleCop