CS fixes
Merge branch 'hotfix/cs-fixes'