CS fixes
Merge pull request #203 from GrahamCampbell/cs

CS Fixes