Fix various issue appears in payment handling strategy.