Minor mods to the plugin classes.