More touch event tweaks