CS fixes
Merge pull request #217 from GrahamCampbell/cs

CS Fixes