Fix: Bankpay & Cardpay fixes

Fix: Bankpay & Cardpay fixes