CS fixes (1)