some CS fixes