checkout bugfixes