diff --git a/EmulatorPkg/Library/EmuBdsLib/PlatformData.c b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
index 977da6a28d..3eb959b894 100644
--- a/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
+++ b/EmulatorPkg/Library/EmuBdsLib/PlatformData.c
@@ -33,11 +33,13 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath = {
   },
   {
     {
-      HARDWARE_DEVICE_PATH,
-      HW_VENDOR_DP,
       {
-        (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),
-        (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        HARDWARE_DEVICE_PATH,
+        HW_VENDOR_DP,
+        {
+          (UINT8) (sizeof (EMU_VENDOR_DEVICE_PATH_NODE)),
+          (UINT8) ((sizeof (EMU_VENDOR_DEVICE_PATH_NODE)) >> 8)
+        },
       },
       EMU_GRAPHICS_WINDOW_PROTOCOL_GUID,
     },
diff --git a/EmulatorPkg/PlatformSmbiosDxe/SmbiosTable.c b/EmulatorPkg/PlatformSmbiosDxe/SmbiosTable.c
index ffb4879a76..9fab301828 100644
--- a/EmulatorPkg/PlatformSmbiosDxe/SmbiosTable.c
+++ b/EmulatorPkg/PlatformSmbiosDxe/SmbiosTable.c
@@ -169,7 +169,7 @@ SMBIOS_TABLE_TYPE3  gSmbiosType3Template = {
   0,    // NumberofPowerCords;
   0,    // ContainedElementCount;
   0,    // ContainedElementRecordLength;
-  { 0 },    // ContainedElements[1];
+  { { 0 } },    // ContainedElements[1];
 };
 CHAR8  *gSmbiosType3Strings[] = {
   "edk2.sourceforge.net",