Fix broken touch handlers

- Really need to run some tests on touch devices beforehand