more fixes for importer