Fixed touch handler issues