Added fixes to payment flow