some fixes caused by renaming of the plugin