Fix watch task stream handling