fixes at the plugin system