File watcher fixes