some more map fixes