Fixed plugin load/unload