Watcher fixes.