CS fixes
Merge pull request #368 from GrahamCampbell/cs

CS Fixes