Minor cs fixes
Merge pull request #4484 from GrahamCampbell/4.1-cs

[4.1] Minor CS Fixes