Hotfix + CS fixes