Fix watchers