diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index 6b80a37..55c81c6 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "cbfs.h"
 
-unsigned int idemp(unsigned int x)
+static unsigned int idemp(unsigned int x)
 {
 	return x;
 }
@@ -123,7 +123,8 @@
 	}
 
 	if (data_end <= data_start) {
-		fprintf(stderr, "E: data ends before it starts. Make sure the ELF file is correct and resides in ROM space.\n");
+		fprintf(stderr, "E: data ends before it starts. Make sure the "
+			"ELF file is correct and resides in ROM space.\n");
 		exit(1);
 	}
 
@@ -175,6 +176,8 @@
 	compress(buffer, data_end - data_start,
 		 (char *)(out + sizeof(struct cbfs_stage)), (int *)&stage->len);
 
+	free(buffer);
+
 	*output = out;
 
 	if (*location)