Improve watchers.