Hotifx + CS fixes