More Checkout Changes