diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index cf35466ca..34b68f8ff 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -121,7 +121,9 @@ run (void *cls,
   if (1 <
       num_partitions)
   {
-    if (GNUNET_OK != plugin->setup_partitions (plugin->cls, num_partitions))
+    if (GNUNET_OK !=
+        plugin->setup_partitions (plugin->cls,
+                                  num_partitions))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not setup partitions. Dropping default ones again\n");
@@ -139,8 +141,9 @@ run (void *cls,
   else if (1 <
            num_foreign_servers)
   {
-    if (GNUNET_OK != plugin->setup_foreign_servers (plugin->cls,
-                                                    num_foreign_servers))
+    if (GNUNET_OK !=
+        plugin->setup_foreign_servers (plugin->cls,
+                                       num_foreign_servers))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not setup shards. Aborting\n");
diff --git a/src/exchangedb/common-0001.sql b/src/exchangedb/common-0001.sql
index 096980879..20fddd499 100644
--- a/src/exchangedb/common-0001.sql
+++ b/src/exchangedb/common-0001.sql
@@ -1583,7 +1583,7 @@ BEGIN
   );
 
   EXECUTE FORMAT(
-    'ALTER FOREIGN TABLE %I OWNER TO %L'
+    'ALTER FOREIGN TABLE %I OWNER TO %I'
     ,source_table_name || '_' || shard_suffix
     ,local_user
   );
@@ -1698,7 +1698,7 @@ LANGUAGE plpgsql
 AS $$
 BEGIN
 
-  RAISE NOTICE 'Creating server %s', remote_host;
+  RAISE NOTICE 'Creating server %', remote_host;
 
   EXECUTE FORMAT(
     'CREATE SERVER IF NOT EXISTS %I '
@@ -1907,6 +1907,7 @@ BEGIN
      ,'taler-exchange-httpd'
     );  
   END LOOP;
+
 END
 $$;
 
diff --git a/src/exchangedb/drop0001.sql b/src/exchangedb/drop0001.sql
index 364578515..ab0e75234 100644
--- a/src/exchangedb/drop0001.sql
+++ b/src/exchangedb/drop0001.sql
@@ -149,8 +149,9 @@ DROP FUNCTION IF EXISTS create_table_partition;
 DROP FUNCTION IF EXISTS create_partitions;
 DROP FUNCTION IF EXISTS detach_default_partitions;
 DROP FUNCTION IF EXISTS drop_default_partitions;
-DROP FUNCTION IF EXISTS master_prepare_sharding;
+DROP FUNCTION IF EXISTS prepare_sharding;
 DROP FUNCTION IF EXISTS create_foreign_table;
+DROP FUNCTION IF EXISTS create_foreign_servers;
 DROP FUNCTION IF EXISTS create_shard_server;