CS fixes
Merge pull request #88 from keradus/cs-fixes

CS fixes