Various map fixes