Final cs fixes
Merge pull request #3940 from GrahamCampbell/4.1-fixes

Final CS Fixes