Minor cs fixes
Merge pull request #4541 from GrahamCampbell/4.2-cs

[4.2] Minor CS Fixes