Fixes to offline checkouts