diff --git a/include/villas/path_source.h b/include/villas/path_source.h
index 81ef6eea5..45cb2e028 100644
--- a/include/villas/path_source.h
+++ b/include/villas/path_source.h
@@ -43,7 +43,7 @@ enum PathSourceType {
 };
 
 struct vpath_source {
-	Logger logger;
+	villas::Logger logger;
 
 	struct vnode *node;
 	struct vpath *path;
diff --git a/lib/mapping.cpp b/lib/mapping.cpp
index 73b8991a4..7d03a1c20 100644
--- a/lib/mapping.cpp
+++ b/lib/mapping.cpp
@@ -200,9 +200,11 @@ int mapping_update(const struct mapping_entry *me, struct sample *remapped, cons
 				case MappingTimestampType::RECEIVED:
 					ts = &original->ts.received;
 					break;
+
 				case MappingTimestampType::ORIGIN:
 					ts = &original->ts.origin;
 					break;
+
 				default:
 					return -1;
 			}
@@ -228,11 +230,9 @@ int mapping_update(const struct mapping_entry *me, struct sample *remapped, cons
 			break;
 
 		case MappingType::DATA:
-			for (unsigned j = me->data.offset,
-				 i = me->offset;
-			         j < MIN(original->length, (unsigned) (me->data.offset + me->length));
-				 j++,
-				 i++)
+			for (unsigned j = me->data.offset,  i = me->offset;
+			     j < MIN(original->length, (unsigned) (me->data.offset + me->length));
+			     j++, i++)
 			{
 				if (j >= original->length)
 					remapped->data[i].f = -1;
diff --git a/lib/nodes/kafka.cpp b/lib/nodes/kafka.cpp
index ec4ce77a3..581235ca4 100644
--- a/lib/nodes/kafka.cpp
+++ b/lib/nodes/kafka.cpp
@@ -67,9 +67,9 @@ static void kafka_logger_cb(const rd_kafka_t *rk, int level, const char *fac, co
 
 static void kafka_message_cb(void *ctx, const rd_kafka_message_t *msg)
 {
-	int ret, cnt = n->in.vectorize;
 	struct vnode *n = (struct vnode *) ctx;
 	struct kafka *k = (struct kafka *) n->_vd;
+	int ret, cnt = n->in.vectorize;
 	struct sample *smps[cnt];
 
 	n->logger->debug("Received a message of {} bytes from broker {}", msg->len, k->server);
diff --git a/lib/signal.cpp b/lib/signal.cpp
index 9ac5bd6b8..c9be59aef 100644
--- a/lib/signal.cpp
+++ b/lib/signal.cpp
@@ -228,7 +228,7 @@ int signal_parse(struct signal *s, json_t *json)
 		signal_data_set(&s->init, s->type, 0);
 
 	if (en >= 0)
-		s->enabled == en != 0;
+		s->enabled = en != 0;
 
 	return 0;
 }