CS fixes
Merge pull request #234 from GrahamCampbell/cs

CS Fixes