diff --git a/mps/code/shield.c b/mps/code/shield.c
index 8d0678f493a..7fc9294b180 100644
--- a/mps/code/shield.c
+++ b/mps/code/shield.c
@@ -300,7 +300,7 @@ static void shieldCache(Arena arena, Seg seg)
   }
 
   /* Allocate shield cache if necessary. */
-  /* FIXME: This will try to extend the cache on every attempt, even
+  /* TODO: This will try to extend the cache on every attempt, even
      if it failed last time. That might be slow. */
   if (arena->shCacheI >= arena->shCacheLength) {
     void *p;
diff --git a/mps/code/trace.c b/mps/code/trace.c
index 3c23e552990..1f3db0d3467 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -737,7 +737,7 @@ found:
   /* buffers under our feet. */
   /* @@@@ This is a short-term fix for request.dylan.160098_. */
   /* .. _request.dylan.160098: https://info.ravenbrook.com/project/mps/import/2001-11-05/mmprevol/request/dylan/160098 */
-  /* FIXME: Where is the corresponding ShieldResume? */
+  /* TODO: Where is the corresponding ShieldResume? */
   ShieldSuspend(arena);
 
   STATISTIC_STAT ({