fixes at watcher