Fixing issues in importer, p.2