diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c
index f23765643..154629ed2 100644
--- a/src/exchange/taler-exchange-httpd_batch-deposit.c
+++ b/src/exchange/taler-exchange-httpd_batch-deposit.c
@@ -545,6 +545,9 @@ TEH_handler_batch_deposit (struct TEH_RequestContext *rc,
   };
   enum GNUNET_GenericReturnValue res;
 
+  memset (&dc,
+          0,
+          sizeof (dc));
   res = TALER_MHD_parse_json_data (connection,
                                    root,
                                    spec);
diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c
index 329643413..3ba986b2d 100644
--- a/src/lib/exchange_api_deposit.c
+++ b/src/lib/exchange_api_deposit.c
@@ -421,7 +421,6 @@ TALER_EXCHANGE_deposit (
                      "/coins/%s/deposit",
                      pub_str);
   }
-
   key_state = TALER_EXCHANGE_get_keys (exchange);
   dki = TALER_EXCHANGE_get_denomination_key_by_hash (key_state,
                                                      &cdd->h_denom_pub);
@@ -431,7 +430,6 @@ TALER_EXCHANGE_deposit (
     GNUNET_break_op (0);
     return NULL;
   }
-
   if (0 >
       TALER_amount_subtract (&amount_without_fee,
                              &cdd->amount,
diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c
index f4efb2719..4761ab6e7 100644
--- a/src/util/wallet_signatures.c
+++ b/src/util/wallet_signatures.c
@@ -138,10 +138,8 @@ TALER_wallet_deposit_sign (
 
   if (NULL != h_age_commitment)
     dr.h_age_commitment = *h_age_commitment;
-
   if (NULL != h_extensions)
     dr.h_extensions = *h_extensions;
-
   TALER_amount_hton (&dr.amount_with_fee,
                      amount);
   TALER_amount_hton (&dr.deposit_fee,
@@ -182,15 +180,12 @@ TALER_wallet_deposit_verify (
 
   if (NULL != h_age_commitment)
     dr.h_age_commitment = *h_age_commitment;
-
   if (NULL != h_extensions)
     dr.h_extensions = *h_extensions;
-
   TALER_amount_hton (&dr.amount_with_fee,
                      amount);
   TALER_amount_hton (&dr.deposit_fee,
                      deposit_fee);
-
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_WALLET_COIN_DEPOSIT,
                                   &dr,