CS fixes
Merge pull request #1780 from aRn0D/cs-fix

Several CS fixes