Fixed some map display
Merge origin/master