more CS fixes