Fix importers