diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c
index a1e71ade2..3434dded9 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -887,7 +887,7 @@ postgres_gc (void *cls)
   struct GNUNET_PQ_PreparedStatement ps[] = {
 #if 0
     GNUNET_PQ_make_prepare ("gc_auditor",
-                            "FIXME #4960",
+                            "TODO: #4960",
                             0),
 #endif
     GNUNET_PQ_PREPARED_STATEMENT_END
@@ -901,7 +901,7 @@ postgres_gc (void *cls)
   if (NULL == conn)
     return GNUNET_SYSERR;
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "FIXME: Auditor GC not implemented (#4960)\n");
+              "TODO: Auditor GC not implemented (#4960)\n");
   qs = GNUNET_PQ_eval_prepared_non_select (conn,
                                            "gc_auditor",
                                            params_time);
diff --git a/src/lib/testing_api_cmd_status.c b/src/lib/testing_api_cmd_status.c
index 1043eecb7..86eeac81d 100644
--- a/src/lib/testing_api_cmd_status.c
+++ b/src/lib/testing_api_cmd_status.c
@@ -112,7 +112,7 @@ reserve_status_cb (void *cls,
   }
 
   /**
-   * FIXME: need a way to check if reserve history is consistent.  Every
+   * TODO: We should check that reserve history is consistent.  Every
    * command which relates to reserve 'x' should be added in a linked list of
    * all commands that relate to the same reserve 'x'.
    *