diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index eaf9fce4d..8e36bc516 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -125,6 +125,7 @@ struct TALER_EXCHANGE_DenomPublicKey
    * revoked by the exchange.
    */
   bool revoked;
+
 };
 
 
@@ -2748,13 +2749,16 @@ TALER_EXCHANGE_batch_withdraw2_cancel (
  */
 struct TALER_EXCHANGE_AgeWithdrawCoinInput
 {
-  /* The master secret from which we derive all other relevant values for
+  /**
+   * The master secret from which we derive all other relevant values for
    * the coin: private key, nonces (if applicable) and age restriction
    */
   const struct TALER_PlanchetMasterSecretP secret[TALER_CNC_KAPPA];
 
-  /* The denomination of the coin.  Must support age restriction, i.e
-   * its .keys.age_mask MUST not be 0 */
+  /**
+   * The denomination of the coin.  Must support age restriction, i.e
+   * its .keys.age_mask MUST not be 0
+   */
   const struct TALER_EXCHANGE_DenomPublicKey *denom_pub;
 };
 
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 9185a6179..996e62734 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -1757,7 +1757,7 @@ TALER_EXCHANGE_keys_to_json (const struct TALER_EXCHANGE_Keys *kd)
         .cipher = dk->key.cipher,
         .value = dk->value,
         .fees = dk->fees,
-        .age_mask = kd->age_mask
+        .age_mask = dk->key.age_mask
       };
       struct GNUNET_HashCode key;
       struct GroupData *gd;
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index c0e4d2f4a..8f7bb930e 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -34,6 +34,9 @@ EXPIRE_IDLE_SLEEP_INTERVAL = 1 s
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"
 
+[taler-exchange-secmod-cs]
+LOOKAHEAD_SIGN = 24 days
+
 [taler-exchange-secmod-rsa]
 LOOKAHEAD_SIGN = 24 days