Even more CS fixes