diff --git a/include/villas/node_type.h b/include/villas/node_type.h
index aa57bd4ba..277380f13 100644
--- a/include/villas/node_type.h
+++ b/include/villas/node_type.h
@@ -28,7 +28,7 @@ struct node_type {
 	size_t size;			/**< Size of private data bock. @see node::_vd */
 	
 	enum node_type_state {
-		NODE_TYPE_UNINITIALIZED = 0,
+		NODE_TYPE_DEINITIALIZED = 0,
 		NODE_TYPE_INITIALIZED
 	} state;
 	
diff --git a/lib/kernel/rt.c b/lib/kernel/rt.c
index 5adee9038..4f6b4776f 100644
--- a/lib/kernel/rt.c
+++ b/lib/kernel/rt.c
@@ -15,7 +15,11 @@
 #include "kernel/rt.h"
 
 int rt_init(int priority, int affinity)
-{ INDENT
+{
+	info("Initialize real-time sub-system");
+	
+	{ INDENT
+	
 	int is_rt;
 
 	/* Use FIFO scheduler with real time priority */
@@ -32,6 +36,8 @@ int rt_init(int priority, int affinity)
 		rt_set_affinity(affinity);
 	else
 		warn("You should use the 'affinity' setting to pin VILLASnode to dedicate CPU cores");
+	
+	}
 
 	return 0;
 }
diff --git a/lib/node_type.c b/lib/node_type.c
index 75b5baa3f..9e6a329a8 100644
--- a/lib/node_type.c
+++ b/lib/node_type.c
@@ -18,7 +18,7 @@ int node_type_init(struct node_type *vt, int argc, char *argv[], config_setting_
 {
 	int ret;
 	
-	if (vt->state != NODE_TYPE_UNINITIALIZED)
+	if (vt->state != NODE_TYPE_DEINITIALIZED)
 		return -1;
 
 	info("Initializing " YEL("%s") " node type", vt->name);
@@ -45,7 +45,7 @@ int node_type_deinit(struct node_type *vt)
 	}
 	
 	if (ret == 0)
-		vt->state = NODE_TYPE_UNINITIALIZED;
+		vt->state = NODE_TYPE_DEINITIALIZED;
 
 	return ret;
 }
diff --git a/src/pipe.c b/src/pipe.c
index a82c11990..af5209b9c 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -104,8 +104,10 @@ static void * send_loop(void *ctx)
 
 retry:			reason = sample_fscan(stdin, s, NULL);
 			if (reason < 0) {
-				if (feof(stdin))
+				if (feof(stdin)) {
+					info("Reached end-of-file. Terminating...");
 					goto killme;
+				}
 				else {
 					warn("Skipped invalid message message: reason=%d", reason);
 					goto retry;