A few cs fixes
Removed extra semicolons
Merge pull request #5625 from GrahamCampbell/4.2-cs

[4.2] A Few CS Fixes