CS fixes