Payment plugins fixes