diff --git a/src/exchangedb/exchange-0001-part.sql b/src/exchangedb/exchange-0001-part.sql
index 4599d2ee7..72b084104 100644
--- a/src/exchangedb/exchange-0001-part.sql
+++ b/src/exchangedb/exchange-0001-part.sql
@@ -573,7 +573,7 @@ COMMENT ON COLUMN policy_details.accumulated_total_val
 COMMENT ON COLUMN policy_details.fee_val
   IS 'The fee for this policy, due when the policy is fulfilled or timed out';
 COMMENT ON COLUMN policy_details.transferable_val
-  IS 'The amount that on fulfilment or timeout will be transfered to the payto-URI''s of the corresponding deposit''s.  The policy fees must have been already deducted from it.  Invariant: fee+transferable <= accumulated_total.  The remaining amount (accumulated_total - fee - transferable) can be refreshed by the owner of the coins when the state is Timeout or Success.';
+  IS 'The amount that on fulfillment or timeout will be transferred to the payto-URI''s of the corresponding deposit''s.  The policy fees must have been already deducted from it.  Invariant: fee+transferable <= accumulated_total.  The remaining amount (accumulated_total - fee - transferable) can be refreshed by the owner of the coins when the state is Timeout or Success.';
 COMMENT ON COLUMN policy_details.fulfillment_state
   IS 'State of the fulfillment:
        - 0 (Failure)
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 0b03fe4b1..e4f714c2a 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -4083,7 +4083,7 @@ compute_shard (const struct TALER_MerchantPublicKeyP *merchant_pub)
  * @param deposit deposit operation details
  * @param known_coin_id row of the coin in the known_coins table
  * @param h_payto hash of the merchant's bank account details
- * @param _blocked true if an extension is blocking the wire transfer
+ * @param policy_details_serial_id pointer to the ID of the entry in policy_details, maybe NULL
  * @param[in,out] exchange_timestamp time to use for the deposit (possibly updated)
  * @param[out] balance_ok set to true if the balance was sufficient
  * @param[out] in_conflict set to true if the deposit conflicted
@@ -4514,7 +4514,7 @@ hash_code_cmp (
  * Add a proof of fulfillment into the policy_fulfillments table
  *
  * @param cls the `struct PostgresClosure` with the plugin-specific state
- * @param[out] proof_id set record id for the proof
+ * @param fulfillment fullfilment transaction data to be added
  * @return query execution status
  */
 static enum GNUNET_DB_QueryStatus
@@ -10678,7 +10678,7 @@ postgres_delete_shard_locks (void *cls)
  *
  * @param cls the @e cls of this struct with the plugin-specific state
  * @param extension_name the name of the extension
- * @param config JSON object of the configuration as string
+ * @param manifest JSON object of the configuration as string
  * @return transaction status code
  */
 enum GNUNET_DB_QueryStatus
diff --git a/src/extensions/age_restriction/age_restriction.c b/src/extensions/age_restriction/age_restriction.c
index 581242503..4db1e6b98 100644
--- a/src/extensions/age_restriction/age_restriction.c
+++ b/src/extensions/age_restriction/age_restriction.c
@@ -241,7 +241,7 @@ libtaler_extension_age_restriction_init (void *arg)
 /**
  * @brief implements the done() function for GNUNET_PLUGIN_load
  *
- * @param cfg unsued
+ * @param arg unsued
  * @return pointer to TALER_Extension on success or NULL otherwise.
  */
 void *
diff --git a/src/include/taler_extensions.h b/src/include/taler_extensions.h
index 5e53d27f8..a37a7461a 100644
--- a/src/include/taler_extensions.h
+++ b/src/include/taler_extensions.h
@@ -100,7 +100,7 @@ struct TALER_Extension
   bool critical;
 
   /**
-   * Version of the extension must be provided in Taler's protocol verison ranges notation, see
+   * Version of the extension must be provided in Taler's protocol version ranges notation, see
    * https://docs.taler.net/core/api-common.html#protocol-version-ranges
    */
   char *version;
diff --git a/src/include/taler_extensions_policy.h b/src/include/taler_extensions_policy.h
index 14a581f3c..1072e214b 100644
--- a/src/include/taler_extensions_policy.h
+++ b/src/include/taler_extensions_policy.h
@@ -89,7 +89,7 @@ struct TALER_PolicyDetails
    * the state changes to Timeout or Success. */
   struct TALER_Amount policy_fee;
 
-  /* The amount that will be transfered to the payto-URIs from the
+  /* The amount that will be transferred to the payto-URIs from the
    * corresponding deposits when the fulfillment state changes to Timeout
    * or Success.  Note that a fulfillment handler can alter this upon
    * arrival of a proof of fulfillment. The remaining amount
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index d0527cc74..7f17df030 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -771,7 +771,7 @@ TALER_JSON_wire_to_payto (const json_t *wire_s);
  * @param[out] ech where to write the policy hash
  */
 void
-TALER_deposit_policy_hash (const json_t *extensions,
+TALER_deposit_policy_hash (const json_t *policy,
                            struct TALER_ExtensionPolicyHashP *ech);
 
 /**