watcher fixes: unique ids for files