A few cs fixes
Merge pull request #182 from GrahamCampbell/cs

A few cs fixes