CS fixes
Merge pull request #1285 from dereuromark/master-cs-fixes

CS fixes