diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs
index 2930f6b8056..3eeec8b1c86 100644
--- a/crates/ra_vfs/src/lib.rs
+++ b/crates/ra_vfs/src/lib.rs
@@ -225,7 +225,7 @@ impl Vfs {
                     }
                 }
                 watcher::WatcherChange::Rescan => {
-                    // TODO send Task::AddRoot?
+                    // TODO we should reload all files
                 }
             },
             io::TaskResult::LoadChange(None) => {}
diff --git a/crates/ra_vfs/src/watcher.rs b/crates/ra_vfs/src/watcher.rs
index a5401869ce7..190a9f92452 100644
--- a/crates/ra_vfs/src/watcher.rs
+++ b/crates/ra_vfs/src/watcher.rs
@@ -86,7 +86,8 @@ impl Watcher {
     pub fn shutdown(mut self) -> thread::Result<()> {
         self.bomb.defuse();
         drop(self.watcher);
-        // TODO this doesn't terminate for some reason
+        // TODO this doesn't terminate because of a buf in `notify`
+        // uncomment when https://github.com/passcod/notify/pull/170 is released
         // let res = self.thread.join();
         // match &res {
         //     Ok(()) => log::info!("... Watcher terminated with ok"),