Some minor updates to WorldMap classes