Additional changes to offline checkouts