diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 4702f1e0bc..bfdab6c2ec 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -177,8 +177,8 @@ void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer,
 			     struct cbfs_media *media,
 			     size_t offset, size_t count) {
 	void *address = buffer->buffer + buffer->allocated;;
-	DEBUG("simple_buffer_map(offset=%d, count=%d): "
-	      "allocated=%d, size=%d, last_allocate=%d\n",
+	DEBUG("simple_buffer_map(offset=%zd, count=%zd): "
+	      "allocated=%zd, size=%zd, last_allocate=%zd\n",
 	    offset, count, buffer->allocated, buffer->size,
 	    buffer->last_allocate);
 	if (buffer->allocated + count >= buffer->size)
@@ -198,7 +198,7 @@ void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer,
 	// TODO Add simple buffer management so we can free more than last
 	// allocated one.
 	DEBUG("simple_buffer_unmap(address=0x%p): "
-	      "allocated=%d, size=%d, last_allocate=%d\n",
+	      "allocated=%zd, size=%zd, last_allocate=%zd\n",
 	    address, buffer->allocated, buffer->size,
 	    buffer->last_allocate);
 	if ((buffer->buffer + buffer->allocated - buffer->last_allocate) ==
diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c
index 6e4f4890c4..42b8c0966f 100644
--- a/src/lib/cbfs_core.c
+++ b/src/lib/cbfs_core.c
@@ -132,7 +132,7 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name)
 			uint32_t new_align = align;
 			if (offset % align)
 				new_align += align - (offset % align);
-			ERROR("ERROR: No file header found at 0x%xx - "
+			ERROR("ERROR: No file header found at 0x%x - "
 			      "try next aligned address: 0x%x.\n", offset,
 			      offset + new_align);
 			offset += new_align;