FSEvents watcher fixes