Bug fixes in map display