CS fixes (2)