Fix some more CS