Some fixes for map scrolling