Fix Watch tasks