Remaining 164 mapping changes.