diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 7939644e51c..4e4e88162e6 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -20,8 +20,8 @@ use vec;
 
 use pipes::{recv, try_recv, wait_many, peek, PacketHeader};
 
-// NOTE Making this public exposes some plumbing from pipes. Needs
-// some refactoring
+// FIXME #5160: Making this public exposes some plumbing from
+// pipes. Needs some refactoring
 pub use pipes::Selectable;
 
 /// A trait for things that can send multiple messages.
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index b0e13717b82..9f39e1433fc 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -120,7 +120,7 @@ upcall_fail(char const *expr,
             size_t line) {
     rust_task *task = rust_try_get_current_task();
     if (task == NULL) {
-        // NOTE: Need to think about what to do here
+        // FIXME #5161: Need to think about what to do here
         printf("failure outside of a task");
         abort();
     }