More minor map fixes