checkout fixes