Tweaks to touch support