CS fixes
Merge pull request #276 from GrahamCampbell/cs

CS Fixes