Fixing issues in importer, p.3