More fixes for resize map on window resize