more hacks to make reloading/stepping through the checkout sort of work.