diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index fce27ce5e..f2c73faa3 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -419,7 +419,7 @@ struct TALER_RefreshLinkEncrypted
  * private key and the coin's public key.
  *
  * @param secret_enc encrypted link secret
- * @param transfer_priv transfer private key
+ * @param trans_priv transfer private key
  * @param coin_pub coin public key
  * @param[out] secret set to the shared secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
@@ -437,7 +437,7 @@ TALER_link_decrypt_secret (const struct TALER_EncryptedLinkSecretP *secret_enc,
  * public key and the coin's private key.
  *
  * @param secret_enc encrypted link secret
- * @param transfer_pub transfer public key
+ * @param trans_pub transfer public key
  * @param coin_priv coin private key
  * @param[out] secret set to the shared secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
@@ -455,8 +455,8 @@ TALER_link_decrypt_secret2 (const struct TALER_EncryptedLinkSecretP *secret_enc,
  *
  * @param secret link secret to encrypt
  * @param coin_pub coin public key
- * @param transfer_priv[out] set to transfer private key
- * @param transfer_pub[out] set to transfer public key
+ * @param[out] trans_priv set to transfer private key
+ * @param[out] trans_pub set to transfer public key
  * @param[out] secret_enc set to the encryptd @a secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
diff --git a/src/include/taler_mintdb_plugin.h b/src/include/taler_mintdb_plugin.h
index 0c9b21ebd..1a4a6c602 100644
--- a/src/include/taler_mintdb_plugin.h
+++ b/src/include/taler_mintdb_plugin.h
@@ -1085,7 +1085,7 @@ struct TALER_MINTDB_Plugin
   /**
    * Obtain shared secret and transfer public key from the public key of
    * the coin.  This information and the link information returned by
-   * #TALER_db_get_link() enable the owner of an old coin to determine
+   * @e get_link_data_list() enable the owner of an old coin to determine
    * the private keys of the new coins after the melt.
    *
    *
@@ -1113,7 +1113,7 @@ struct TALER_MINTDB_Plugin
    * @param sesssion database connection
    * @param lock lock operation
    * @return #GNUNET_YES if known,
-   *         #GNUENT_NO if not,
+   *         #GNUNET_NO if not,
    *         #GNUNET_SYSERR on internal error
    */
   int
diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h
index 980ca29bf..d02dc55a6 100644
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@ -394,7 +394,7 @@ TALER_PQ_exec_prepared (PGconn *db_conn,
  * is returned.
  *
  * @param result result to process
- * @param[in|out] rs result specification to extract for
+ * @param[in,out] rs result specification to extract for
  * @param row row from the result to extract
  * @return
  *   #GNUNET_YES if all results could be extracted
diff --git a/src/mintdb/plugin_mintdb_postgres.c b/src/mintdb/plugin_mintdb_postgres.c
index 8bf3302df..e5eb7cce7 100644
--- a/src/mintdb/plugin_mintdb_postgres.c
+++ b/src/mintdb/plugin_mintdb_postgres.c
@@ -848,7 +848,7 @@ postgres_commit (void *cls,
  * Insert a denomination key
  *
  * @param cls the @e cls of this struct with the plugin-specific state
- * @param sesssion connection to use
+ * @param session connection to use
  * @param dki the denomination key information
  * @return #GNUNET_OK on success; #GNUNET_SYSERR on failure
  */
@@ -2099,14 +2099,14 @@ postgres_get_refresh_commit_links (void *cls,
  * Get all of the information from the given melt commit operation.
  *
  * @param cls the @e cls of this struct with the plugin-specific state
- * @param sesssion database connection to use
+ * @param session database connection to use
  * @param session_hash hash to identify refresh session
  * @return NULL if the @a session_hash does not correspond to any known melt
  *         operation
  */
 static struct TALER_MINTDB_MeltCommitment *
 postgres_get_melt_commitment (void *cls,
-                              struct TALER_MINTDB_Session *sesssion,
+                              struct TALER_MINTDB_Session *session,
                               const struct GNUNET_HashCode *session_hash)
 {
   // FIXME: needs to be implemented!
diff --git a/src/pq/db_pq.c b/src/pq/db_pq.c
index bb18c56a9..a718c805f 100644
--- a/src/pq/db_pq.c
+++ b/src/pq/db_pq.c
@@ -266,7 +266,7 @@ TALER_PQ_cleanup_result (struct TALER_PQ_ResultSpec *rs)
  * is returned.
  *
  * @param result result to process
- * @param[in|out] rs result specification to extract for
+ * @param[in,out] rs result specification to extract for
  * @param row row from the result to extract
  * @return
  *   #GNUNET_YES if all results could be extracted
diff --git a/src/util/crypto.c b/src/util/crypto.c
index 966f010e4..8cd08af63 100644
--- a/src/util/crypto.c
+++ b/src/util/crypto.c
@@ -371,7 +371,7 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info)
  * private key and the coin's public key.
  *
  * @param secret_enc encrypted link secret
- * @param transfer_priv transfer private key
+ * @param trans_priv transfer private key
  * @param coin_pub coin public key
  * @param[out] secret set to the shared secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
@@ -410,7 +410,7 @@ TALER_link_decrypt_secret (const struct TALER_EncryptedLinkSecretP *secret_enc,
  * public key and the coin's private key.
  *
  * @param secret_enc encrypted link secret
- * @param transfer_pub transfer public key
+ * @param trans_pub transfer public key
  * @param coin_priv coin private key
  * @param[out] secret set to the shared secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
@@ -449,8 +449,8 @@ TALER_link_decrypt_secret2 (const struct TALER_EncryptedLinkSecretP *secret_enc,
  *
  * @param secret link secret to encrypt
  * @param coin_pub coin public key
- * @param transfer_priv[out] set to transfer private key
- * @param transfer_pub[out] set to transfer public key
+ * @param[out] trans_priv set to transfer private key
+ * @param[out] trans_pub set to transfer public key
  * @param[out] secret_enc set to the encryptd @a secret
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */