Checkout bug fixes