Adjusting pluginmanager changes from lib