More checkout changes