Map Gesture Fixes