More fixes for payment processing