Changes to plugin loading.