CS fixes
Merge pull request #70 from GrahamForks/cs

More CS Fixes