Some touch fixes