Minor tweaks to the plugin