Compacting IDs and name fixes