Yet more touch fixes