diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag
index b16d63c58..f270ba5ea 100644
--- a/contrib/gnunet.tag
+++ b/contrib/gnunet.tag
@@ -83,6 +83,19 @@
       <arglist>(n, type)</arglist>
     </member>
   </compound>
+
+  <compound kind="file">
+    <name>gnunet_strings_lib.h</name>
+    <path></path>
+    <filename>gnunet_strings_lib.h</filename>
+    <member kind="function">
+      <type>#define</type>
+      <name>GNUNET_STRINGS_filename_expand</name>
+      <anchorfile>gnunet_strings_lib.h</anchorfile>
+      <arglist>(const char *name)</arglist>
+    </member>
+  </compound>
+
   <compound kind="file">
     <name>gnunet_db_lib.h</name>
     <path></path>
@@ -99,6 +112,18 @@
       <anchorfile>gnunet_db_lib.h</anchorfile>
       <arglist></arglist>
     </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_DB_STATUS_HARD_ERROR</name>
+      <anchorfile>gnunet_db_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
+      <name>GNUNET_DB_STATUS_SOFT_ERROR</name>
+      <anchorfile>gnunet_db_lib.h</anchorfile>
+      <arglist></arglist>
+    </member>
   </compound>
   <compound kind="file">
     <name>gnunet_pq_lib.h</name>
diff --git a/src/exchangedb/lrbt_callbacks.c b/src/exchangedb/lrbt_callbacks.c
index 8acc99cdd..14968ac1c 100644
--- a/src/exchangedb/lrbt_callbacks.c
+++ b/src/exchangedb/lrbt_callbacks.c
@@ -30,7 +30,7 @@
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_denominations (void *cls,
@@ -97,7 +97,7 @@ lrbt_cb_table_denominations (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_denomination_revocations (void *cls,
@@ -144,7 +144,7 @@ lrbt_cb_table_denomination_revocations (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_reserves (void *cls,
@@ -196,7 +196,7 @@ lrbt_cb_table_reserves (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_reserves_in (void *cls,
@@ -252,7 +252,7 @@ lrbt_cb_table_reserves_in (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_reserves_close (void *cls,
@@ -309,7 +309,7 @@ lrbt_cb_table_reserves_close (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_reserves_out (void *cls,
@@ -368,7 +368,7 @@ lrbt_cb_table_reserves_out (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_auditors (void *cls,
@@ -421,7 +421,7 @@ lrbt_cb_table_auditors (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_auditor_denom_sigs (void *cls,
@@ -472,7 +472,7 @@ lrbt_cb_table_auditor_denom_sigs (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_exchange_sign_keys (void *cls,
@@ -528,7 +528,7 @@ lrbt_cb_table_exchange_sign_keys (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_signkey_revocations (void *cls,
@@ -574,7 +574,7 @@ lrbt_cb_table_signkey_revocations (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_known_coins (void *cls,
@@ -622,7 +622,7 @@ lrbt_cb_table_known_coins (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_refresh_commitments (void *cls,
@@ -680,7 +680,7 @@ lrbt_cb_table_refresh_commitments (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_refresh_revealed_coins (void *cls,
@@ -741,7 +741,7 @@ lrbt_cb_table_refresh_revealed_coins (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_refresh_transfer_keys (void *cls,
@@ -807,7 +807,7 @@ lrbt_cb_table_refresh_transfer_keys (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_deposits (void *cls,
@@ -890,7 +890,7 @@ lrbt_cb_table_deposits (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_refunds (void *cls,
@@ -940,7 +940,7 @@ lrbt_cb_table_refunds (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_wire_out (void *cls,
@@ -991,7 +991,7 @@ lrbt_cb_table_wire_out (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_aggregation_tracking (void *cls,
@@ -1038,7 +1038,7 @@ lrbt_cb_table_aggregation_tracking (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_wire_fee (void *cls,
@@ -1092,7 +1092,7 @@ lrbt_cb_table_wire_fee (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_recoup (void *cls,
@@ -1146,7 +1146,7 @@ lrbt_cb_table_recoup (void *cls,
  *
  * @param cls closure
  * @param result the postgres result
- * @param num_result the number of results in @a result
+ * @param num_results the number of results in @a result
  */
 static void
 lrbt_cb_table_recoup_refresh (void *cls,
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index e4618262a..29eedb8f4 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -9765,16 +9765,16 @@ postgres_lookup_wire_fee_by_time (
 
 
 /**
-   * Lookup the latest serial number of @a table.  Used in
-   * exchange-auditor database replication.
-   *
-   * @param cls closure
-   * @param session a session
-   * @param table table for which we should return the serial
-   * @param[out] latest serial number in use
-   * @return transaction status code, GNUNET_DB_STATUS_HARD_ERROR if
-   *         @a table does not have a serial number
-   */
+ * Lookup the latest serial number of @a table.  Used in
+ * exchange-auditor database replication.
+ *
+ * @param cls closure
+ * @param session a session
+ * @param table table for which we should return the serial
+ * @param[out] serial latest serial number in use
+ * @return transaction status code, GNUNET_DB_STATUS_HARD_ERROR if
+ *         @a table does not have a serial number
+ */
 static enum GNUNET_DB_QueryStatus
 postgres_lookup_serial_by_table (void *cls,
                                  struct TALER_EXCHANGEDB_Session *session,
@@ -10062,7 +10062,7 @@ typedef enum GNUNET_DB_QueryStatus
  *
  * @param cls closure
  * @param session a session
- * @param tb table data to insert
+ * @param td table data to insert
  * @return transaction status code, #GNUNET_DB_STATUS_HARD_ERROR if
  *         @e table in @a tr is not supported
  */
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index 4ea845b49..8d1bbec26 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -1078,7 +1078,7 @@ TALER_wallet_link_sign (const struct GNUNET_HashCode *h_denom_pub,
  * @param transfer_pub transfer public key
  * @param coin_ev coin envelope
  * @param coin_ev_size number of bytes in @a coin_ev
- * @param old_coin_priv private key to sign with
+ * @param old_coin_pub old coin key that the link signature is for
  * @param coin_sig resulting signature
  * @return #GNUNET_OK if the signature is valid
  */
diff --git a/src/testing/testing_api_cmd_change_auth.c b/src/testing/testing_api_cmd_change_auth.c
index 830d4e808..fdf5d3591 100644
--- a/src/testing/testing_api_cmd_change_auth.c
+++ b/src/testing/testing_api_cmd_change_auth.c
@@ -17,7 +17,7 @@
   <http://www.gnu.org/licenses/>
 */
 /**
- * @file testing/testing_api_change_auth.c
+ * @file testing/testing_api_cmd_change_auth.c
  * @brief command(s) to change CURL context authorization header
  * @author Christian Grothoff
  */