Small CS fixes