Order and payment flow fixes