more CS Fixes