Bug fixes to Plugins.