diff --git a/src/auditor/taler-auditor-exchange.c b/src/auditor/taler-auditor-exchange.c
index 04181ce3f..b34d14842 100644
--- a/src/auditor/taler-auditor-exchange.c
+++ b/src/auditor/taler-auditor-exchange.c
@@ -213,7 +213,7 @@ main (int argc,
         ? "Could not remove exchange from database: entry already absent\n"
         : "Could not add exchange to database: entry already exists\n");
       TALER_AUDITORDB_plugin_unload (adb);
-      return EXIT_FAILURE;
+      return EXIT_SUCCESS;
     }
   }
   TALER_AUDITORDB_plugin_unload (adb);
diff --git a/src/benchmark/taler-exchange-benchmark.c b/src/benchmark/taler-exchange-benchmark.c
index 993b66811..7170648f9 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -565,7 +565,7 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
       if (GNUNET_OK !=
           TALER_TESTING_prepare_bank (cfg_filename,
                                       GNUNET_NO,
-                                      "exchange-account-2",
+                                      "exchange-account-test",
                                       &bc))
       {
         return 1;
diff --git a/src/exchangedb/0004-kyc_attributes.sql b/src/exchangedb/0004-kyc_attributes.sql
index c13f47d9a..e45d46b3b 100644
--- a/src/exchangedb/0004-kyc_attributes.sql
+++ b/src/exchangedb/0004-kyc_attributes.sql
@@ -28,7 +28,7 @@ BEGIN
 END $$;
 
 COMMENT ON FUNCTION master_table_kyc_attributes_V2
-  IS 'Removes birthdate colum from the kyc_attributes table';
+  IS 'Removes birthdate column from the kyc_attributes table';
 
 INSERT INTO exchange_tables
     (name