Fixed touch bugs