diff --git a/src/exchangedb/exchange-0001.sql b/src/exchangedb/exchange-0001.sql
index 7ad0676cc..4a6c9afb5 100644
--- a/src/exchangedb/exchange-0001.sql
+++ b/src/exchangedb/exchange-0001.sql
@@ -285,6 +285,9 @@ COMMENT ON COLUMN known_coins.denom_sig
 CREATE INDEX IF NOT EXISTS known_coins_by_denomination
   ON known_coins
   (denominations_serial);
+CREATE INDEX IF NOT EXISTS known_coins_by_hashed_coin_pub
+  ON known_coins
+  USING HASH (coin_pub);
 
 
 CREATE TABLE IF NOT EXISTS refresh_commitments
@@ -302,6 +305,9 @@ COMMENT ON TABLE refresh_commitments
 CREATE INDEX IF NOT EXISTS refresh_commitments_old_coin_id_index
   ON refresh_commitments
   (old_known_coin_id);
+CREATE INDEX IF NOT EXISTS known_coins_by_hashed_rc
+  ON refresh_commitments
+  USING HASH (rc);
 
 
 CREATE TABLE IF NOT EXISTS refresh_revealed_coins
@@ -422,7 +428,6 @@ CREATE INDEX IF NOT EXISTS deposits_get_ready_index
   ,refund_deadline
   ,tiny
   ,done
-  ,kyc_ok
   ,extension_blocked
   );
 COMMENT ON INDEX deposits_coin_pub_merchant_contract_index
diff --git a/src/exchangedb/test_exchangedb.c b/src/exchangedb/test_exchangedb.c
index 8b075509a..6807c2425 100644
--- a/src/exchangedb/test_exchangedb.c
+++ b/src/exchangedb/test_exchangedb.c
@@ -95,6 +95,7 @@ mark_prepare_cb (void *cls,
                  const char *buf,
                  size_t buf_size)
 {
+  (void) cls;
   GNUNET_assert (11 == buf_size);
   GNUNET_assert (0 == strcasecmp (wire_method,
                                   "testcase"));
@@ -1384,10 +1385,13 @@ recoup_cb (void *cls,
 {
   const union TALER_DenominationBlindingKeyP *cb = cls;
 
+  (void) rowid;
   (void) timestamp;
   (void) amount;
   (void) reserve_pub;
   (void) coin_sig;
+  (void) coin;
+  (void) denom_pub;
   FAILIF (NULL == cb);
   FAILIF (0 != GNUNET_memcmp (cb,
                               coin_blind));