Fix Watcher issues