diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 407535408f..a5dce2b5aa 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -550,7 +550,7 @@ Returns:
               // Update HandOffHob for new installed permenent memory
               //
               NewHandOffTable->EfiEndOfHobList =
-                (EFI_PHYSICAL_ADDRESS)(VOID*)((UINTN) NewHandOffTable->EfiEndOfHobList + Offset);
+                (EFI_PHYSICAL_ADDRESS)((UINTN) NewHandOffTable->EfiEndOfHobList + Offset);
               NewHandOffTable->EfiMemoryTop        = PrivateInMem->PhysicalMemoryBegin +
                                                      PrivateInMem->PhysicalMemoryLength;
               NewHandOffTable->EfiMemoryBottom     = PrivateInMem->PhysicalMemoryBegin;
diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 358889213e..4947912535 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -774,6 +774,7 @@ Returns:
     return EFI_INVALID_PARAMETER;
   }
 
+  VolumeHandle = 0;
   //
   // Retrieve the FirmwareVolume which the file resides in.
   //
diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 457804fef2..a64bb3c633 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -21,12 +21,6 @@ Abstract:
 
 #include <PeiMain.h>
 
-static EFI_PEI_PPI_DESCRIPTOR mMemoryDiscoveredPpi = {
-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),
-  &gEfiPeiMemoryDiscoveredPpiGuid,
-  NULL
-};
-
 VOID
 InitializeMemoryServices (
   IN PEI_CORE_INSTANCE           *PrivateData,