adding more CS fixes