diff --git a/src/bank-lib/bank_api_admin.c b/src/bank-lib/bank_api_admin.c
index 2cc3ec8e7..4208f442a 100644
--- a/src/bank-lib/bank_api_admin.c
+++ b/src/bank-lib/bank_api_admin.c
@@ -112,6 +112,7 @@ handle_admin_add_incoming_finished (void *cls,
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break_op (0);
     ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_FORBIDDEN:
diff --git a/src/bank-lib/bank_api_credit.c b/src/bank-lib/bank_api_credit.c
index bb0d86631..551831d24 100644
--- a/src/bank-lib/bank_api_credit.c
+++ b/src/bank-lib/bank_api_credit.c
@@ -40,11 +40,6 @@ struct TALER_BANK_CreditHistoryHandle
    */
   char *request_url;
 
-  /**
-   * The base URL of the bank.
-   */
-  char *bank_base_url;
-
   /**
    * Handle for the request.
    */
@@ -144,8 +139,8 @@ handle_credit_history_finished (void *cls,
                                 const void *response)
 {
   struct TALER_BANK_CreditHistoryHandle *hh = cls;
-  enum TALER_ErrorCode ec;
   const json_t *j = response;
+  enum TALER_ErrorCode ec;
 
   hh->job = NULL;
   switch (response_code)
@@ -236,7 +231,7 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
                            TALER_BANK_CreditHistoryCallback hres_cb,
                            void *hres_cb_cls)
 {
-  char *url;
+  char url[128];
   struct TALER_BANK_CreditHistoryHandle *hh;
   CURL *eh;
 
@@ -250,28 +245,28 @@ TALER_BANK_credit_history (struct GNUNET_CURL_Context *ctx,
          (0 > num_results) ) ||
        ( (0 == start_row) &&
          (0 < num_results) ) )
-    GNUNET_asprintf (&url,
+    GNUNET_snprintf (url,
+                     sizeof (url),
                      "history/incoming?delta=%lld",
                      (long long) num_results);
   else
-    GNUNET_asprintf (&url,
+    GNUNET_snprintf (url,
+                     sizeof (url),
                      "history/incoming?delta=%lld&start=%llu",
                      (long long) num_results,
-                     start_row);
+                     (unsigned long long) start_row);
   hh = GNUNET_new (struct TALER_BANK_CreditHistoryHandle);
   hh->hcb = hres_cb;
   hh->hcb_cls = hres_cb_cls;
   hh->request_url = TALER_url_join (auth->wire_gateway_url,
                                     url,
                                     NULL);
-  GNUNET_free (url);
   if (NULL == hh->request_url)
   {
     GNUNET_free (hh);
     GNUNET_break (0);
     return NULL;
   }
-  hh->bank_base_url = GNUNET_strdup (auth->wire_gateway_url);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Requesting credit history at `%s'\n",
               hh->request_url);
@@ -316,7 +311,6 @@ TALER_BANK_credit_history_cancel (struct TALER_BANK_CreditHistoryHandle *hh)
     hh->job = NULL;
   }
   GNUNET_free (hh->request_url);
-  GNUNET_free (hh->bank_base_url);
   GNUNET_free (hh);
 }
 
diff --git a/src/bank-lib/bank_api_debit.c b/src/bank-lib/bank_api_debit.c
index 9b4e9a494..1418492e2 100644
--- a/src/bank-lib/bank_api_debit.c
+++ b/src/bank-lib/bank_api_debit.c
@@ -141,8 +141,8 @@ handle_debit_history_finished (void *cls,
                                const void *response)
 {
   struct TALER_BANK_DebitHistoryHandle *hh = cls;
-  enum TALER_ErrorCode ec;
   const json_t *j = response;
+  enum TALER_ErrorCode ec;
 
   hh->job = NULL;
   switch (response_code)
@@ -235,7 +235,7 @@ TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
                           TALER_BANK_DebitHistoryCallback hres_cb,
                           void *hres_cb_cls)
 {
-  char *url;
+  char url[128];
   struct TALER_BANK_DebitHistoryHandle *hh;
   CURL *eh;
 
@@ -249,21 +249,22 @@ TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
          (0 > num_results) ) ||
        ( (0 == start_row) &&
          (0 < num_results) ) )
-    GNUNET_asprintf (&url,
+    GNUNET_snprintf (url,
+                     sizeof (url),
                      "history/outgoing?delta=%lld",
                      (long long) num_results);
   else
-    GNUNET_asprintf (&url,
+    GNUNET_snprintf (url,
+                     sizeof (url),
                      "history/outgoing?delta=%lld&start=%llu",
                      (long long) num_results,
-                     start_row);
+                     (unsigned long long) start_row);
   hh = GNUNET_new (struct TALER_BANK_DebitHistoryHandle);
   hh->hcb = hres_cb;
   hh->hcb_cls = hres_cb_cls;
   hh->request_url = TALER_url_join (auth->wire_gateway_url,
                                     url,
                                     NULL);
-  GNUNET_free (url);
   if (NULL == hh->request_url)
   {
     GNUNET_free (hh);
@@ -271,7 +272,7 @@ TALER_BANK_debit_history (struct GNUNET_CURL_Context *ctx,
     return NULL;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Requesting history at `%s'\n",
+              "Requesting debit history at `%s'\n",
               hh->request_url);
   eh = curl_easy_init ();
   if ( (NULL == eh) ||
diff --git a/src/bank-lib/bank_api_transfer.c b/src/bank-lib/bank_api_transfer.c
index e713f0409..3ff40eace 100644
--- a/src/bank-lib/bank_api_transfer.c
+++ b/src/bank-lib/bank_api_transfer.c
@@ -204,6 +204,7 @@ handle_transfer_finished (void *cls,
   case MHD_HTTP_BAD_REQUEST:
     /* This should never happen, either us or the bank is buggy
        (or API version conflict); just pass JSON reply to the application */
+    GNUNET_break_op (0);
     ec = TALER_JSON_get_error_code (j);
     break;
   case MHD_HTTP_UNAUTHORIZED: