Improve handling of wandering touches