CS fixes
Merge pull request #339 from GrahamCampbell/cs

CS Fixes