Minor CS corrections
Merge pull request #3163 from dereuromark/3.0-cs

Minor CS corrections