Minor cs fixes
Merge pull request #2754 from GrahamCampbell/fixes

Minor CS Fixes