More fixes to the API importer.