diff --git a/BootloaderCorePkg/BootloaderCorePkg.fdf b/BootloaderCorePkg/BootloaderCorePkg.fdf
index d2d82f0f..556704e1 100755
--- a/BootloaderCorePkg/BootloaderCorePkg.fdf
+++ b/BootloaderCorePkg/BootloaderCorePkg.fdf
@@ -129,7 +129,7 @@ FV = OsLoader
 
   INF BootloaderCorePkg/Stage1A/Stage1A.inf
 
-  INF RuleOverride = RESET_VECTOR USE = $(ARCH) $(PLATFORM_PACKAGE)/Stage1A/Ia32/Vtf0/Bin/ResetVector.inf
+  INF RuleOverride = RESET_VECTOR USE = $(ARCH) BootloaderCorePkg/Stage1A/Ia32/Vtf0/Bin/ResetVector.inf
 
 #------------------------------------------------------------------------------
 # STAGE1B FV
diff --git a/BootloaderCorePkg/Include/Library/BootloaderCoreLib.h b/BootloaderCorePkg/Include/Library/BootloaderCoreLib.h
index 1a88a53a..24dacfde 100644
--- a/BootloaderCorePkg/Include/Library/BootloaderCoreLib.h
+++ b/BootloaderCorePkg/Include/Library/BootloaderCoreLib.h
@@ -50,8 +50,7 @@ typedef enum {
 } BUF_INFO_ID;
 
 typedef struct {
-  UINT32        LdrGlobal;
-  UINT32        Reserved;
+  UINT64        LdrGlobal;
   IA32_IDT_GATE_DESCRIPTOR  IdtTable[STAGE_IDT_ENTRY_COUNT];
 } STAGE_IDT_TABLE;
 
diff --git a/BootloaderCorePkg/Stage1A/Stage1A.inf b/BootloaderCorePkg/Stage1A/Stage1A.inf
index 9d6d8441..9a97cde7 100755
--- a/BootloaderCorePkg/Stage1A/Stage1A.inf
+++ b/BootloaderCorePkg/Stage1A/Stage1A.inf
@@ -30,7 +30,6 @@
 
 [Sources.X64]
   X64/SecEntry.nasm
-  X64/Stage1AArch.c
 
 [Packages]
   MdePkg/MdePkg.dec