diff --git a/src/mint/taler-mint-httpd_db.c b/src/mint/taler-mint-httpd_db.c
index a3df58658..f5aa11722 100644
--- a/src/mint/taler-mint-httpd_db.c
+++ b/src/mint/taler-mint-httpd_db.c
@@ -23,6 +23,8 @@
  * - /deposit: properly check existing deposits
  * - /deposit: properly perform commit (check return value)
  * - /deposit: check for leaks
+ * - ALL: check API: given structs are usually not perfect, as they
+ *        often contain too many fields for the context
  */
 #include "platform.h"
 #include <pthread.h>
diff --git a/src/mint/taler-mint-httpd_keys.c b/src/mint/taler-mint-httpd_keys.c
index ac792f7fe..aa1e2c6e6 100644
--- a/src/mint/taler-mint-httpd_keys.c
+++ b/src/mint/taler-mint-httpd_keys.c
@@ -19,6 +19,10 @@
  * @author Florian Dold
  * @author Benedikt Mueller
  * @author Christian Grothoff
+ *
+ * TODO:
+ * - separate key management into a file separate from
+ *   /keys handling (to fit other handlers)
  */
 #include "platform.h"
 #include <gnunet/gnunet_util_lib.h>