Some adjustments in plugin management