Fixes for plugins