Fixes for desktop maps control