Minor CS fixes