Checkout tweaks