CS fixes
Merge pull request #244 from GrahamCampbell/cs

CS Fixes