Fix some touch bugs