More CS fixes