Some more CS fixes (sorry)