Handling Payments - Payment Fixes