Post launch CS tweaks