Minor changes in the watcher