watcher fixes