More fixes for the importer.