diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index d3d90aedb..7e1af6e9a 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -1609,6 +1609,7 @@ process_credits (void *cls);
  * transactions).
  *
  * @param cls `struct WireAccount` we are processing
+ * @param http_status HTTP status returned by the bank
  * @param ec error code in case something went wrong
  * @param row_off identification of the position at which we are querying
  * @param details details about the wire transfer
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 968d22556..b46f022f1 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -702,12 +702,13 @@ function test_11() {
 echo "===========11: spurious outgoing transfer ==========="
 OLD_ID=`echo "SELECT id FROM app_banktransaction WHERE amount='TESTKUDOS:10' ORDER BY id LIMIT 1;" | psql $DB -Aqt`
 OLD_ACC=`echo "SELECT debit_account_id FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
+OLD_SUBJECT=`echo "SELECT subject FROM app_banktransaction WHERE id=$OLD_ID;" | psql $DB -Aqt`
 # Change wire transfer to be FROM the exchange (#2) to elsewhere!
 # (Note: this change also causes a missing incoming wire transfer, but
 #  this test is only concerned about the outgoing wire transfer
 #  being detected as such, and we simply ignore the other
 #  errors being reported.)
-echo "UPDATE app_banktransaction SET debit_account_id=2,credit_account_id=1 WHERE id=$OLD_ID;" | psql -Aqt $DB
+echo -e "UPDATE app_banktransaction SET debit_account_id=2,credit_account_id=1,subject='CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/' WHERE id=$OLD_ID;" | psql -Aqt $DB
 
 run_audit
 
@@ -740,7 +741,7 @@ fi
 echo PASS
 
 # Undo database modification (exchange always has account #2)
-echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC,credit_account_id=2 WHERE id=$OLD_ID;" | psql -Aqt $DB
+echo "UPDATE app_banktransaction SET debit_account_id=$OLD_ACC,credit_account_id=2,subject=$OLD_SUBJECT WHERE id=$OLD_ID;" | psql -Aqt $DB
 
 }
 
diff --git a/src/auditordb/plugin_auditordb_postgres.c b/src/auditordb/plugin_auditordb_postgres.c
index 7e20600a0..f231af279 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -1906,6 +1906,9 @@ postgres_get_auditor_progress_coin (void *cls,
  * @param session connection to use
  * @param master_pub master key of the exchange
  * @param account_name name of the wire account we are auditing
+ * @param pp how far are we in the auditor's tables
+ * @param in_wire_off how far are we in the incoming wire transfers
+ * @param out_wire_off how far are we in the outgoing wire transfers
  * @return transaction status code
  */
 static enum GNUNET_DB_QueryStatus
diff --git a/src/bank-lib/bank_api_transfer.c b/src/bank-lib/bank_api_transfer.c
index 584f056ac..e8138adbf 100644
--- a/src/bank-lib/bank_api_transfer.c
+++ b/src/bank-lib/bank_api_transfer.c
@@ -73,8 +73,8 @@ GNUNET_NETWORK_STRUCT_END
  * @param exchange_base_url base URL of this exchange (included in subject
  *        to facilitate use of tracking API by merchant backend)
  * @param wtid wire transfer identifier to use
- * @param buf[out] set to transfer data to persist, NULL on error
- * @param buf_size[out] set to number of bytes in @a buf, 0 on error
+ * @param[out] buf set to transfer data to persist, NULL on error
+ * @param[out] buf_size set to number of bytes in @a buf, 0 on error
  */
 void
 TALER_BANK_prepare_wire_transfer (const char *destination_account_url,
diff --git a/src/exchange/taler-exchange-httpd_keystate.h b/src/exchange/taler-exchange-httpd_keystate.h
index 5a7afa2d5..004ce5014 100644
--- a/src/exchange/taler-exchange-httpd_keystate.h
+++ b/src/exchange/taler-exchange-httpd_keystate.h
@@ -131,8 +131,8 @@ enum TEH_KS_DenominationKeyUse
  * @param key_state state to look in
  * @param denom_pub_hash hash of denomination public key
  * @param use purpose for which the key is being located
- * @param ec[out] set to the error code, in case the operation failed
- * @param hc[out] set to the HTTP status code to use
+ * @param[out] ec set to the error code, in case the operation failed
+ * @param[out] hc set to the HTTP status code to use
  * @return the denomination key issue,
  *         or NULL if denom_pub could not be found (or is not valid at this time for the given @a use)
  */
diff --git a/src/exchange/taler-exchange-httpd_refresh_melt.c b/src/exchange/taler-exchange-httpd_refresh_melt.c
index e2d92c509..91ca58e5f 100644
--- a/src/exchange/taler-exchange-httpd_refresh_melt.c
+++ b/src/exchange/taler-exchange-httpd_refresh_melt.c
@@ -366,7 +366,7 @@ refresh_melt_transaction (void *cls,
  * happened.  We now need to validate the coins being melted and the
  * session signature and then hand things of to execute the melt
  * operation.  This function parses the JSON arrays and then passes
- * processing on to #handle_refresh_melt_binary().
+ * processing on to #refresh_melt_transaction().
  *
  * @param connection the MHD connection to handle
  * @param[in,out] rmc details about the melt request
@@ -578,9 +578,9 @@ check_for_denomination_key (struct MHD_Connection *connection,
 
 /**
  * Handle a "/refresh/melt" request.  Parses the request into the JSON
- * components and then hands things of to #handle_refresh_melt_json()
+ * components and then hands things of to #check_for_denomination_key()
  * to validate the melted coins, the signature and execute the melt
- * using TEH_DB_execute_refresh_melt().
+ * using handle_refresh_melt().
  *
  * @param rh context of the handler
  * @param connection the MHD connection to handle
diff --git a/src/exchange/taler-exchange-httpd_refresh_reveal.c b/src/exchange/taler-exchange-httpd_refresh_reveal.c
index c9d0b44fc..2035bd9f8 100644
--- a/src/exchange/taler-exchange-httpd_refresh_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refresh_reveal.c
@@ -887,13 +887,13 @@ handle_refresh_reveal_json (struct MHD_Connection *connection,
 
 
 /**
- * Handle a "/refresh/reveal" request. This time, the client reveals
- * the private transfer keys except for the cut-and-choose value
- * returned from "/refresh/melt".  This function parses the revealed
- * keys and secrets and ultimately passes everything to
- * #TEH_DB_execute_refresh_reveal() which will verify that the
- * revealed information is valid then returns the signed refreshed
- * coins.
+ * Handle a "/refresh/reveal" request. This time, the client reveals the
+ * private transfer keys except for the cut-and-choose value returned from
+ * "/refresh/melt".  This function parses the revealed keys and secrets and
+ * ultimately passes everything to #resolve_refresh_reveal_denominations()
+ * which will verify that the revealed information is valid then runs the
+ * transaction in #refresh_reveal_transaction() and finally returns the signed
+ * refreshed coins.
  *
  * @param rh context of the handler
  * @param connection the MHD connection to handle
diff --git a/src/exchange/taler-exchange-httpd_track_transfer.c b/src/exchange/taler-exchange-httpd_track_transfer.c
index 4347e7d69..14671ce0b 100644
--- a/src/exchange/taler-exchange-httpd_track_transfer.c
+++ b/src/exchange/taler-exchange-httpd_track_transfer.c
@@ -253,12 +253,13 @@ struct WtidTransactionContext
  * transaction data for the given wire transfer identifier.
  *
  * @param cls our context for transmission
- * @param rowid which row in the DB is the information from (for diagnostics)
+ * @param rowid which row in the DB is the information from (for diagnostics), ignored
  * @param merchant_pub public key of the merchant (should be same for all callbacks with the same @e cls)
  * @param h_wire hash of wire transfer details of the merchant (should be same for all callbacks with the same @e cls)
  * @param wire where the funds were sent
  * @param exec_time execution time of the wire transfer (should be same for all callbacks with the same @e cls)
  * @param h_contract_terms which proposal was this payment about
+ * @param denom_pub denomination public key of the @a coin_pub (ignored)
  * @param coin_pub which public key was this payment about
  * @param deposit_value amount contributed by this coin in total
  * @param deposit_fee deposit fee charged by exchange for this coin
diff --git a/src/exchange/taler-exchange-httpd_validation.c b/src/exchange/taler-exchange-httpd_validation.c
index 0ca127eb2..79c01716b 100644
--- a/src/exchange/taler-exchange-httpd_validation.c
+++ b/src/exchange/taler-exchange-httpd_validation.c
@@ -66,7 +66,7 @@ load_fee (const char *method)
 
 
 /**
- * Initialize account; checks if @ai has /wire information, and if so,
+ * Initialize account; checks if @a ai has /wire information, and if so,
  * adds the /wire information (if included) to our responses. Also, if
  * the account is debitable, we try to load the plugin.
  *