more importer bug fixes