Fix watch main tasks