Little CS fixes