Fixing more CS