diff --git a/src/rt/memory_region.h b/src/rt/memory_region.h
index 145020e3ccaf..fbc439a92a6d 100644
--- a/src/rt/memory_region.h
+++ b/src/rt/memory_region.h
@@ -3,7 +3,7 @@
  * memory management and isolation between tasks, and domains.
  *
  * FIXME: Implement a custom lock-free malloc / free instead of relying solely
- *       on the standard malloc / free.
+ *       on the standard malloc / free. (#2686)
  */
 
 #ifndef MEMORY_REGION_H
diff --git a/src/rt/rust.cpp b/src/rt/rust.cpp
index 7efc3b8839c0..7a909c57348a 100644
--- a/src/rt/rust.cpp
+++ b/src/rt/rust.cpp
@@ -67,8 +67,8 @@ command_line_args : public kernel_owned<command_line_args>
 };
 
 // A global that indicates whether Rust typestate claim statements should be
-// executed Generated code will read this variable directly (I think).
-// FIXME: This belongs somewhere else
+// executed. Generated code will read this variable directly (I think).
+// FIXME: This belongs somewhere else (#2670)
 int check_claims = 0;
 
 /**
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
index bc215c4e7b2f..3f754a442981 100644
--- a/src/rt/rust_builtin.cpp
+++ b/src/rt/rust_builtin.cpp
@@ -233,7 +233,7 @@ rand_free(randctx *rctx) {
 /* Debug helpers strictly to verify ABI conformance.
  *
  * FIXME: move these into a testcase when the testsuite
- * understands how to have explicit C files included.
+ * understands how to have explicit C files included. (#2688)
  */
 
 struct quad {
@@ -289,17 +289,18 @@ debug_opaque(type_desc *t, uint8_t *front) {
     LOG(task, stdlib, "debug_opaque");
     debug_tydesc_helper(t);
     // FIXME may want to actually account for alignment.  `front` may not
-    // indeed be the front byte of the passed-in argument.
+    // indeed be the front byte of the passed-in argument. (#2667)
     for (uintptr_t i = 0; i < t->size; ++front, ++i) {
         LOG(task, stdlib, "  byte %" PRIdPTR ": 0x%" PRIx8, i, *front);
     }
 }
 
-// FIXME this no longer reflects the actual structure of boxes!
+// FIXME this no longer reflects the actual structure of boxes! (#2667)
 struct rust_box {
     RUST_REFCOUNTED(rust_box)
 
     // FIXME `data` could be aligned differently from the actual box body data
+    // (#2667)
     uint8_t data[];
 };
 
@@ -635,7 +636,7 @@ extern "C" CDECL rust_task*
 rust_new_task_in_sched(rust_sched_id id) {
     rust_task *task = rust_get_current_task();
     rust_scheduler *sched = task->kernel->get_scheduler_by_id(id);
-    // FIXME: What if we didn't get the scheduler?
+    // FIXME: What if we didn't get the scheduler? (#2668)
     return new_task_common(sched, task);
 }
 
diff --git a/src/rt/rust_debug.h b/src/rt/rust_debug.h
index 40a4c28f0528..f0a03665f752 100644
--- a/src/rt/rust_debug.h
+++ b/src/rt/rust_debug.h
@@ -34,7 +34,7 @@ public:
     flag(const char *in_name) : name(in_name), valid(false) {}
 
     bool operator*() {
-        // FIXME: We ought to lock this.
+        // FIXME: We ought to lock this. (#2689)
         if (!valid) {
             char *ev = getenv(name);
             value = ev && ev[0] != '\0' && ev[0] != '0';
diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp
index dc743aceef80..de08436cf3f3 100644
--- a/src/rt/rust_kernel.cpp
+++ b/src/rt/rust_kernel.cpp
@@ -184,7 +184,7 @@ rust_kernel::run() {
     return rval;
 }
 
-// FIXME: Fix all these FIXMEs
+// FIXME: Fix all these FIXMEs (#2690)
 void
 rust_kernel::fail() {
     // FIXME: On windows we're getting "Application has requested the
diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp
index 774a549fe8b1..6e29d873ed2e 100644
--- a/src/rt/rust_log.cpp
+++ b/src/rt/rust_log.cpp
@@ -127,7 +127,7 @@ rust_log::trace_ln(rust_task *task, uint32_t level, char *message) {
     }
 
     // FIXME: The scheduler and task names used to have meaning,
-    // but they are always equal to 'main' currently
+    // but they are always equal to 'main' currently (#2672)
 #if 0
 
 #if defined(__WIN32__)
@@ -234,7 +234,7 @@ void update_crate_map(const cratemap* map, log_directive* dirs,
     update_module_map(map->entries, dirs, n_dirs, n_matches);
     // Then recurse on linked crates
     // FIXME this does double work in diamond-shaped deps. could keep
-    //   a set of visited addresses, if it turns out to be actually slow
+    // a set of visited addresses, if it turns out to be actually slow (#2673)
     for (size_t i = 0; map->children[i]; i++) {
         update_crate_map(map->children[i], dirs, n_dirs, n_matches);
     }
diff --git a/src/rt/rust_run_program.cpp b/src/rt/rust_run_program.cpp
index 8d7396aab932..b089ac46934f 100644
--- a/src/rt/rust_run_program.cpp
+++ b/src/rt/rust_run_program.cpp
@@ -160,7 +160,7 @@ rust_run_program(const char* argv[],
     for (int fd = getdtablesize() - 1; fd >= 3; fd--) close(fd);
     if (dir) {
         int result = chdir(dir);
-        // FIXME: need error handling
+        // FIXME: need error handling (#2674)
         assert(!result && "chdir failed");
     }
 
@@ -178,7 +178,7 @@ rust_run_program(const char* argv[],
 
 extern "C" CDECL int
 rust_process_wait(int proc) {
-    // FIXME: stub; exists to placate linker.
+    // FIXME: stub; exists to placate linker. (#2692)
     return 0;
 }
 
diff --git a/src/rt/rust_sched_loop.cpp b/src/rt/rust_sched_loop.cpp
index e6297ec475c5..a69084fc3adb 100644
--- a/src/rt/rust_sched_loop.cpp
+++ b/src/rt/rust_sched_loop.cpp
@@ -134,7 +134,7 @@ rust_task *
 rust_sched_loop::schedule_task() {
     lock.must_have_lock();
     assert(this);
-    // FIXME: in the face of failing tasks, this is not always right.
+    // FIXME: in the face of failing tasks, this is not always right. (#2695)
     // assert(n_live_tasks() > 0);
     if (running_tasks.length() > 0) {
         size_t k = isaac_rand(&rctx);