final map fixes