Final map fixes before merge