fixes in import_tools