more map fixes