Checkout fixes / version