Fix plugins after former refactoring