Other cs fixes
Merge pull request #258 from GrahamCampbell/other-cs-fixes

Other CS Fixes