Some CS fixes