File watcher fixes.