Fixes for import plugin integration