Fix watchers to actually work properly