More fixes for plugins component