Maps: Some improvements to zooming