plugins fixes