Import alternate IDs and import data fixes