fix some map issues