More tweaks to the event handling to better handle touches