Minor map fixes