Fix a few static analyzer warnings.
More work on the Classic importer.