Resolved some issues with uuids being regenerated during import