CS fixes to make builds pass