More map fixes