Cleanup some autoscan warnings.