Hotfix: bug fixes for importer