fixes for payment gateway