Fix mixing imports for the plugin