Fixes on map controls