Checkout history fixes and additions