Added fixes to payment flow
Merging