More CS private tweaks