payment gateway fixes