Fixes on touch event handlers