fixes on all plugins