watch.go fixes