fixes to plugin next step