Finalised fixes before rollout.