diff --git a/include/villas/kernel/kernel.h b/include/villas/kernel/kernel.h
index d02735139..ef9c05827 100644
--- a/include/villas/kernel/kernel.h
+++ b/include/villas/kernel/kernel.h
@@ -91,7 +91,7 @@ int kernel_get_page_size();
 int kernel_get_hugepage_size();
 
 /** Set SMP affinity of IRQ */
-int kernel_irq_setaffinity(unsigned irq, uintmax_t new , uintmax_t *old );
+int kernel_irq_setaffinity(unsigned irq, uintmax_t aff , uintmax_t *old );
 
 #ifdef __cplusplus
 }
diff --git a/include/villas/mapping.h b/include/villas/mapping.h
index 5bee741f6..e9fb5740f 100644
--- a/include/villas/mapping.h
+++ b/include/villas/mapping.h
@@ -90,7 +90,7 @@ struct mapping_entry {
 
 int mapping_remap(struct list *m, struct sample *remapped, struct sample *original, struct stats *s);
 
-int mapping_update(struct mapping_entry *e, struct sample *remapped, struct sample *new, struct stats *s);
+int mapping_update(struct mapping_entry *e, struct sample *remapped, struct sample *original, struct stats *s);
 
 int mapping_parse(struct mapping_entry *e, json_t *cfg, struct list *nodes);
 
diff --git a/include/villas/stats.h b/include/villas/stats.h
index 2ee375889..ac440a5f5 100644
--- a/include/villas/stats.h
+++ b/include/villas/stats.h
@@ -80,8 +80,8 @@ json_t * stats_json(struct stats *s);
 
 void stats_reset(struct stats *s);
 
-void stats_print_header();
-void stats_print_footer();
+void stats_print_header(enum stats_format fmt);
+void stats_print_footer(enum stats_format fmt);
 
 void stats_print_periodic(struct stats *s, FILE *f, enum stats_format fmt, int verbose, struct node *p);
 
diff --git a/lib/kernel/kernel.c b/lib/kernel/kernel.c
index 27dcfdcbd..bf79d8968 100644
--- a/lib/kernel/kernel.c
+++ b/lib/kernel/kernel.c
@@ -258,7 +258,7 @@ int kernel_has_cap(cap_value_t cap)
 }
 #endif
 
-int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old)
+int kernel_irq_setaffinity(unsigned irq, uintmax_t aff, uintmax_t *old)
 {
 	char fn[64];
 	FILE *f;
@@ -273,7 +273,7 @@ int kernel_irq_setaffinity(unsigned irq, uintmax_t new, uintmax_t *old)
 	if (old)
 		ret = fscanf(f, "%jx", old);
 
-	fprintf(f, "%jx", new);
+	fprintf(f, "%jx", aff);
 	fclose(f);
 
 	return ret;