CS fixes
Merge pull request #171 from GrahamCampbell/cs

CS Fixes