Fix a few bugs in the importer.