diff --git a/src/mint/taler-mint-httpd.c b/src/mint/taler-mint-httpd.c
index 328fa0357..09b2439bb 100644
--- a/src/mint/taler-mint-httpd.c
+++ b/src/mint/taler-mint-httpd.c
@@ -561,7 +561,7 @@ run_fake_client ()
                "Failed to run both `nc' and `ncat': %s\n",
                strerror (errno));
     }
-    exit (0);
+    _exit (1);
   }
   /* parent process */
   GNUNET_break (0 == close (fd));
@@ -757,7 +757,6 @@ main (int argc,
       TMH_plugin->drop_temporary (TMH_plugin->cls,
                                   session);
   }
-
   TALER_MINTDB_plugin_unload (TMH_plugin);
   return (GNUNET_SYSERR == ret) ? 1 : 0;
 }
diff --git a/src/mintdb/mintdb_plugin.c b/src/mintdb/mintdb_plugin.c
index d6c33303e..2e8d206fd 100644
--- a/src/mintdb/mintdb_plugin.c
+++ b/src/mintdb/mintdb_plugin.c
@@ -77,10 +77,8 @@ TALER_MINTDB_plugin_unload (struct TALER_MINTDB_Plugin *plugin)
   if (NULL == plugin)
     return;
   lib_name = plugin->library_name;
-#if SKIP
   GNUNET_assert (NULL == GNUNET_PLUGIN_unload (lib_name,
                                                plugin));
-#endif
   GNUNET_free (lib_name);
 }