some map fixes

fix #1408
fix #1393
fix #1382