CS fixes
Merge pull request #1 from GrahamCampbell/fixes

CS Fixes