diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
index dc7ed07baa..143836be82 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
@@ -28,12 +28,14 @@ Abstract:
 #include <Crc32SectionExtract.h>
 
 EFI_STATUS
+EFIAPI
 InitializeCrc32GuidedSectionExtractionProtocol (
   IN EFI_HANDLE                   ImageHandle,
   IN EFI_SYSTEM_TABLE             *SystemTable
   );
 
 EFI_STATUS
+EFIAPI
 InitializeCrc32GuidedSectionExtractionProtocol (
   IN EFI_HANDLE                   ImageHandle,
   IN EFI_SYSTEM_TABLE             *SystemTable
@@ -98,6 +100,7 @@ Returns:
 
 STATIC
 UINT32
+EFIAPI
 GetSectionLength (
   IN EFI_COMMON_SECTION_HEADER  *CommonHeader
   )
@@ -126,6 +129,7 @@ GetSectionLength (
 
 STATIC
 EFI_STATUS
+EFIAPI
 Crc32ExtractSection (
   IN  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  *This,
   IN  VOID                                    *InputSection,
diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
index 8e32d6d7bb..de2bb3a80a 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
@@ -34,6 +34,7 @@ typedef struct {
 //
 STATIC
 EFI_STATUS
+EFIAPI
 Crc32ExtractSection (
   IN  EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL  *This,
   IN  VOID                                    *InputSection,
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 6eefa0bd30..2f90e3c6b2 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
@@ -449,6 +449,7 @@ Returns:
       Index2                  = (UINT16) (KeyValue - HANDLE_OPTION_OFFSET);
 
       NewMenuEntry            = BOpt_GetMenuEntry (&DriverMenu, Index2);
+      ASSERT (NewMenuEntry != NULL);
       Private->HandleContext  = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;
 
       CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);
@@ -556,6 +557,8 @@ Returns:
   case FORM_CON_COM_ID:
     NewMenuEntry                      = BOpt_GetMenuEntry (&TerminalMenu, Private->CurrentTerminal);
 
+    ASSERT (NewMenuEntry != NULL);
+
     NewTerminalContext                = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
 
     NewTerminalContext->BaudRateIndex = CurrentFakeNVMap->COMBaudRate;
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index c77fa0a351..7a62765fcd 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -175,6 +175,7 @@ ChangeVariableDevicePath (
                       &TerminalMenu,
                       Com
                       );
+      ASSERT (NewMenuEntry != NULL);
       NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
       Uart                = (UART_DEVICE_PATH *) Node;
       CopyMem (
diff --git a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
index 88955c730d..cac68a16b0 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
+++ b/EdkNt32Pkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
@@ -450,6 +450,7 @@ Var_UpdateConsoleOption (
                             NewTerminalContext->DevicePath,
                             (EFI_DEVICE_PATH_PROTOCOL *) &Vendor
                             );
+      ASSERT (TerminalDevicePath != NULL);
       ChangeTerminalDevicePath (TerminalDevicePath, TRUE);
       Temp = DevicePathToStr (TerminalDevicePath);
       ConDevicePath = AppendDevicePathInstance (
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
index 297c2cfc55..9acacc8e72 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/ConsoleOption.c
@@ -175,6 +175,7 @@ ChangeVariableDevicePath (
                       &TerminalMenu,
                       Com
                       );
+      ASSERT (NewMenuEntry != NULL);
       NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;
       Uart                = (UART_DEVICE_PATH *) Node;
       CopyMem (
diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
index c660e409db..454d192a2b 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/Variable.c
@@ -450,6 +450,7 @@ Var_UpdateConsoleOption (
                             NewTerminalContext->DevicePath,
                             (EFI_DEVICE_PATH_PROTOCOL *) &Vendor
                             );
+      ASSERT (TerminalDevicePath != NULL);
       ChangeTerminalDevicePath (TerminalDevicePath, TRUE);
       Temp = DevicePathToStr (TerminalDevicePath);
       ConDevicePath = AppendDevicePathInstance (