Fixing plugin unloading