Fixed stuff i broke with importers refactoring