Touch events fixes