Fixes for swipe events