CS fixes
Merge pull request #838 from GrahamCampbell/cs

CS Fixes