checkout fixes etc