Fixed several touch issues