A more fixes needed for map display