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

Minor CS Fixes