CS fixes (3)