More cs fixes
Merge pull request #184 from GrahamCampbell/cs

More CS Fixes