CS fixes
Merge pull request #797 from peterkokot/patch-1

CS fixes