diff --git a/BaseTools/ImageTool/UeEmit.c b/BaseTools/ImageTool/UeEmit.c
index ea5f2290bc..321dfa909f 100644
--- a/BaseTools/ImageTool/UeEmit.c
+++ b/BaseTools/ImageTool/UeEmit.c
@@ -909,6 +909,7 @@ ToolImageEmitUeFile (
   return true;
 }
 
+// FIXME: Find a better solution. Separate metadata storage?
 static
 bool
 ToolImageEmitUeXipFile (
diff --git a/MdePkg/Include/Library/UefiImageLib.h b/MdePkg/Include/Library/UefiImageLib.h
index 1b9a6b3c2e..14a944710e 100644
--- a/MdePkg/Include/Library/UefiImageLib.h
+++ b/MdePkg/Include/Library/UefiImageLib.h
@@ -16,6 +16,7 @@ typedef enum {
 #define UEFI_IMAGE_SOURCE_ALL     2U
 #define UEFI_IMAGE_SOURCE_MAX     3U
 
+// FIXME: Get rid of pointers.
 typedef struct {
   UINT32     ImageBuffer;
   UINT32     AddressOfEntryPoint;