Toq watch fixes