*checkout fixes