small CS fixes