more fixes for watcher/updater