- small changes to pluginloading