fixes to watcher