Fix watch triggers