Tweaks to checkout flow