Final plugins fixes