Checkout fixes