Some more CS fixes