Tweaks to checkout