Update for map fixes