Importers fixes