Improve handling of Pounce and Swipe