Random CS fixes
Merge pull request #2010 from aRn0D/content/cs_fix

Random CS fixes