Work on fixing the gesture issues.