diff --git a/server/include/file.h b/server/include/file.h
index c6bfd458b..51733cc32 100644
--- a/server/include/file.h
+++ b/server/include/file.h
@@ -42,7 +42,7 @@ struct file {
 	struct timespec offset;	/**< An offset between the timestamp in the input file and the current time */
 
 	double rate;		/**< The sending rate. */
-	int tfd;		/**< Timer file descriptor. Blocks until 1/rate seconds are elapsed. */
+	int tfd;		/**< Timer file descriptor. Blocks until 1 / rate seconds are elapsed. */
 };
 
 /** @see node_vtable::init */
diff --git a/server/include/msg_format.h b/server/include/msg_format.h
index dfda52201..d919c26bc 100644
--- a/server/include/msg_format.h
+++ b/server/include/msg_format.h
@@ -44,9 +44,10 @@
   #error "Unknown byte order!"
 #endif
 
-/** The total length of a message */
+/** The total size in bytes of a message */
 #define MSG_LEN(msg)		(4 * ((msg)->length + 4))
 
+/** The timestamp of a message in struct timespec format */
 #define MSG_TS(msg) (struct timespec) {	\
 	.tv_sec  = (msg)->ts.sec,	\
 	.tv_nsec = (msg)->ts.nsec	\
diff --git a/server/src/hist.c b/server/src/hist.c
index ed8d36c39..b92492fb4 100644
--- a/server/src/hist.c
+++ b/server/src/hist.c
@@ -118,7 +118,7 @@ void hist_print(struct hist *h)
 		hist_plot(h);
 
 		char *buf = hist_dump(h);
-		info(buf);
+		info("Matlab: %s", buf);
 		free(buf);
 	}
 }
diff --git a/server/src/node.c b/server/src/node.c
index 352fa3814..71b3dba29 100644
--- a/server/src/node.c
+++ b/server/src/node.c
@@ -54,6 +54,7 @@ int node_deinit()
 			vt->deinit();
 		}
 	}
+
 	return 0;
 }
 
diff --git a/server/src/path.c b/server/src/path.c
index 1bb5e3ed2..d15393682 100644
--- a/server/src/path.c
+++ b/server/src/path.c
@@ -94,7 +94,7 @@ static void * path_run(void *arg)
 		/* For each received message... */
 		for (int i = 0; i < recv; i++) {
 			p->previous = p->current;
-			p->current  = &p->pool[ p->received % p->poolsize];
+			p->current  = &p->pool[p->received % p->poolsize];
 
 			p->received++;