Fix several touch issues