Merge "Fix minor issues with PluginLoader"