diff --git a/src/exchange/taler-exchange-httpd_purses_merge.c b/src/exchange/taler-exchange-httpd_purses_merge.c
index cd6f85471..d3bded6e0 100644
--- a/src/exchange/taler-exchange-httpd_purses_merge.c
+++ b/src/exchange/taler-exchange-httpd_purses_merge.c
@@ -169,7 +169,7 @@ reply_merge_success (struct MHD_Connection *connection,
   else
   {
 #if WAD_NOT_IMPLEMENTED
-    /* FIXME: figure out partner, lookup wad fee by partner! */
+    /* FIXME: figure out partner, lookup wad fee by partner! #7271 */
     if (0 >
         TALER_amount_subtract (&merge_amount,
                                &pcc->target_amount,
diff --git a/src/lib/exchange_api_reserves_open.c b/src/lib/exchange_api_reserves_open.c
index b41c3f88b..64d259ba0 100644
--- a/src/lib/exchange_api_reserves_open.c
+++ b/src/lib/exchange_api_reserves_open.c
@@ -282,7 +282,7 @@ handle_reserves_open_finished (void *cls,
     rs.hr.hint = TALER_JSON_get_error_hint (j);
     break;
   case MHD_HTTP_CONFLICT:
-    // FIXME: not yet specified, but needed in
+    // FIXME: not yet specified (#7428), but needed in
     // case of double-spending or insufficient
     // reserve balance!
     rs.hr.ec = TALER_JSON_get_error_code (j);
diff --git a/src/templating/templating_api.c b/src/templating/templating_api.c
index 6384672f3..47ada208e 100644
--- a/src/templating/templating_api.c
+++ b/src/templating/templating_api.c
@@ -191,13 +191,10 @@ TALER_TEMPLATING_build (struct MHD_Connection *connection,
                             template);
     if (NULL == tmpl)
     {
-      /* FIXME: should this not be an
-         internal failure? The language
-         mismatch is not critical here! */
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Failed to load template `%s'\n",
                   template);
-      *http_status = MHD_HTTP_NOT_ACCEPTABLE;
+      *http_status = MHD_HTTP_INTERNAL_SERVER_ERROR;
       *reply = TALER_MHD_make_error (TALER_EC_GENERIC_FAILED_TO_LOAD_TEMPLATE,
                                      template);
       return GNUNET_NO;
diff --git a/src/util/exchange_signatures.c b/src/util/exchange_signatures.c
index 6bf63a5fa..3169cb84c 100644
--- a/src/util/exchange_signatures.c
+++ b/src/util/exchange_signatures.c
@@ -454,8 +454,7 @@ struct TALER_ExchangeAccountSetupSuccessPS
    */
   struct TALER_PaytoHashP h_payto;
 
-  // FIXME: include details on *which* KYC process
-  // was satisfied! #7427
+  /* FIXME: include details on *which* KYC process was satisfied! #7427 */
 
   /**
    * When was the signature made.