diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 974ba6f924..62546ed187 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -273,6 +273,9 @@
 [LibraryClasses.EBC.DXE_RUNTIME_DRIVER]
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
 
+[LibraryClasses.EBC.PEI_CORE]
+  TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
+
 [PcdsFeatureFlag.common]
   PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE
   PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid|FALSE
@@ -346,6 +349,13 @@
   PcdStatusCodeValueMouseInputError|gEfiMdePkgTokenSpaceGuid|0x01020007           # EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR
   PcdStatusCodeValueMouseReset|gEfiMdePkgTokenSpaceGuid|0x01020001                # EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET
 
+  PcdUartDefaultBaudRate|gEfiMdePkgTokenSpaceGuid|115200
+  PcdUartDefaultDataBits|gEfiMdePkgTokenSpaceGuid|8
+  PcdUartDefaultParity|gEfiMdePkgTokenSpaceGuid|1
+  PcdUartDefaultStopBits|gEfiMdePkgTokenSpaceGuid|1
+  PcdDefaultTerminalType|gEfiMdePkgTokenSpaceGuid|0
+
+
 [PcdsFixedAtBuild.IPF]
   PcdIoBlockBaseAddressForIpf|gEfiMdePkgTokenSpaceGuid|0x0ffffc000000
 
diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
index f5eaa0f622..4bcd46ee94 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
@@ -48,17 +48,17 @@
   Pxe_bc_udp.c
 
 [Sources.IA32]
-  Ia32\PxeArch.h
+  Ia32/PxeArch.h
 
 [Sources.X64]
-  X64\PxeArch.h
+  X64/PxeArch.h
 
 [Sources.IPF]
-  Ipf\PxeArch.h
+  Ipf/PxeArch.h
 
 [Sources.EBC]
-  Ebc\PxeArch.h
-  Ebc\PxeArch.c
+  Ebc/PxeArch.h
+  Ebc/PxeArch.c
 
 
 [Packages]
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index 3542bdd646..9e478eb879 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -20,7 +20,7 @@
 #include <Library/PciLib.h>
 #include <Library/PeimEntryPoint.h>
 
-#include <IndustryStandard\Pci.h>
+#include <IndustryStandard/Pci.h>
 
 /**
    Convert EFI_PEI_PCI_CFG_PPI_PCI_ADDRESS to PCI_LIB_ADDRESS.
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
index b61d739b3e..c62e705b0a 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
@@ -53,15 +53,10 @@
   BaseMemoryLib
 
 
-[Protocols.IA32]
+[Protocols]
   gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED
   gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED
 
-[Protocols.X64]
-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED
-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED
-
-
 [Depex]
   TRUE