Payments Bugs fixed