Fixes to plugin architecture.