Fixes for touch events