Fix build, plugin loading