diff --git a/src/topology/builder.c b/src/topology/builder.c
index 15757668..f8aba830 100644
--- a/src/topology/builder.c
+++ b/src/topology/builder.c
@@ -55,7 +55,7 @@ static ssize_t write_block_header(snd_tplg_t *tplg, unsigned int type,
 			" offset 0x%zx is %s by %ld bytes",
 			tplg->next_hdr_pos, tplg->bin_pos,
 			tplg->bin_pos > tplg->next_hdr_pos ? "ahead" : "behind",
-			labs(tplg->bin_pos - tplg->next_hdr_pos));
+			tplg->bin_pos - tplg->next_hdr_pos);
 		return -EINVAL;
 	}
 
diff --git a/src/topology/ctl.c b/src/topology/ctl.c
index 47db400f..1d31b494 100644
--- a/src/topology/ctl.c
+++ b/src/topology/ctl.c
@@ -1363,7 +1363,7 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg,
 		et->texts = tplg_calloc(heap, sizeof(char *) * ec->items);
 		if (!et->texts)
 			return -ENOMEM;
-		for (i = 0; i < ec->items; i++)
+		for (i = 0; (unsigned int)i < ec->items; i++)
 			et->texts[i] = ec->texts[i];
 	}