diff --git a/src/pipe.c b/src/pipe.c
index f72037829..e08734c96 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -59,7 +59,7 @@ static void quit(int signal, siginfo_t *sinfo, void *ctx)
 	cfg_destroy(&cfg);
 
 	info(GRN("Goodbye!"));
-	exit(EXIT_SUCCESS);
+	_exit(EXIT_SUCCESS);
 }
 
 static void usage()
@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
 
 	ret = node_type_init(node->_vt, argc-optind, argv+optind, config_root_setting(&cfg.cfg));
 	if (ret)
-		error("Failed to intialize node: %s", node_name(node));
+		error("Failed to intialize node type: %s", node_name(node));
 
 	ret = node_start(node);
 	if (ret)
diff --git a/src/signal.c b/src/signal.c
index 0f84dc18e..1e2121548 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -141,6 +141,8 @@ check:		if (optarg == endptr)
 		if (tfd < 0)
 			serror("Failed to create timer");
 	}
+	else
+		tfd = -1;
 
 	start = time_now();
 
diff --git a/tests/main.c b/tests/main.c
index 370ba501f..fd5039240 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -12,9 +12,11 @@
 #include <villas/memory.h>
 
 int main(int argc, char *argv[]) {
-	struct criterion_test_set *tests = criterion_initialize();
 	
-	info("Initialize memory system");
+	struct criterion_test_set *tests = criterion_initialize();
+	struct log log;
+
+	log_init(&log, V, LOG_ALL);
 	memory_init();
 
 	int result = 0;