diff --git a/src/exchangedb/drop0001.sql b/src/exchangedb/drop0001.sql
index f0f46a611..7ffa7554c 100644
--- a/src/exchangedb/drop0001.sql
+++ b/src/exchangedb/drop0001.sql
@@ -43,8 +43,8 @@ DROP TABLE IF EXISTS reserves CASCADE;
 DROP TABLE IF EXISTS denomination_revocations CASCADE;
 DROP TABLE IF EXISTS denominations CASCADE;
 
--- Drop versioning (0000.sql)
-DROP SCHEMA IF EXISTS _v CASCADE;
+-- Unregister patch (0001.sql)
+SELECT _v.unregister_patch('exchange-0001', NULL, NULL);
 
 -- And we're out of here...
 COMMIT;
diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h
index 0212e61f1..c5d0e5cac 100644
--- a/src/include/taler_bank_service.h
+++ b/src/include/taler_bank_service.h
@@ -384,16 +384,16 @@ struct TALER_BANK_DebitDetails
   const char *exchange_base_url;
 
   /**
-   * payto://-URL of the source account that
+   * payto://-URI of the source account that
    * send the funds.
    */
-  const char *debit_account_url;
+  const char *debit_account_url; // FIXME: rename: url->uri
 
   /**
-   * payto://-URL of the target account that
+   * payto://-URI of the target account that
    * received the funds.
    */
-  const char *credit_account_url;
+  const char *credit_account_url; // FIXME: rename: url->uri
 
 };