diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c
index 5610555..5ab7ffa 100644
--- a/payloads/libpayload/libcbfs/cbfs.c
+++ b/payloads/libpayload/libcbfs/cbfs.c
@@ -135,21 +135,21 @@
 		cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL);
 	/* this is a mess. There is no ntohll. */
 	/* for now, assume compatible byte order until we solve this. */
-	uint32_t entry;
+	uintptr_t entry;
 	uint32_t final_size;
 
 	if (stage == NULL)
 		return (void *) -1;
 
-	LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
+	LOG("loading stage %s @ 0x%p (%d bytes), entry @ 0x%llx\n",
 			name,
-			(uint32_t) stage->load, stage->memlen,
+			(void*)(uintptr_t) stage->load, stage->memlen,
 			stage->entry);
 
 	final_size = cbfs_decompress(stage->compression,
 				     ((unsigned char *) stage) +
 				     sizeof(struct cbfs_stage),
-				     (void *) (uint32_t) stage->load,
+				     (void *) (uintptr_t) stage->load,
 				     stage->len);
 	if (!final_size)
 		return (void *) -1;
@@ -179,8 +179,7 @@
 		return 1;
 	}
 
-	/* FIXME: This isn't right */
-	LOG("run @ %p\n", (void *) ntohl((uint32_t) stage->entry));
+	LOG("run @ %p\n", (void *) (uintptr_t)ntohll(stage->entry));
 	return run_address((void *)(uintptr_t)ntohll(stage->entry));
 }