diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 769f8a5e4..07c731931 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -2054,7 +2054,7 @@ TEH_keys_get_handler (const struct TEH_RequestHandler *rh,
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Client provided invalid cherry picking timestamp %s, returning full response\n",
                   GNUNET_STRINGS_absolute_time_to_string (last_issue_date));
-      krd = &ksh->krd_array[0];
+      krd = &ksh->krd_array[ksh->krd_array_length - 1];
     }
     if (NULL == krd)
     {
diff --git a/src/util/taler-exchange-secmod-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c
index e2a71e6a9..195992e1e 100644
--- a/src/util/taler-exchange-secmod-eddsa.c
+++ b/src/util/taler-exchange-secmod-eddsa.c
@@ -1108,6 +1108,7 @@ update_keys (void *cls)
                                            duration),
                  lookahead_sign),
                overlap_duration)).rel_value_us) )
+  {
     if (GNUNET_OK !=
         create_key ())
     {
@@ -1115,6 +1116,7 @@ update_keys (void *cls)
       GNUNET_SCHEDULER_shutdown ();
       return;
     }
+  }
   /* remove expired keys */
   while ( (NULL != keys_head) &&
           (0 ==