Fix plugin loading
Updates