Some small changes to plugin.