More minor cs fixes
Merge pull request #3919 from GrahamCampbell/4.1-fixes

More Minor CS Fixes