Some cs fixes.
Merge pull request #148 from tersmitten/cs-fixes

Some cs fixes.