Tweaks on going live