Fix up touch event handling