diff --git a/MdeModulePkg/Core/PiSmmCore/Smi.c b/MdeModulePkg/Core/PiSmmCore/Smi.c
index 6b56fa5f698..de2c8a52deb 100644
--- a/MdeModulePkg/Core/PiSmmCore/Smi.c
+++ b/MdeModulePkg/Core/PiSmmCore/Smi.c
@@ -151,7 +151,6 @@ SmiManage (
   EFI_STATUS   Status;
 
   PERF_FUNCTION_BEGIN ();
-  mSmiManageCallingDepth++;
   WillReturn   = FALSE;
   Status       = EFI_NOT_FOUND;
   ReturnStatus = Status;
@@ -175,6 +174,7 @@ SmiManage (
   }
 
   Head = &SmiEntry->SmiHandlers;
+  mSmiManageCallingDepth++;
 
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {
     SmiHandler = CR (Link, SMI_HANDLER, Link, SMI_HANDLER_SIGNATURE);
diff --git a/StandaloneMmPkg/Core/Mmi.c b/StandaloneMmPkg/Core/Mmi.c
index fb205df4900..47ef20df78d 100644
--- a/StandaloneMmPkg/Core/Mmi.c
+++ b/StandaloneMmPkg/Core/Mmi.c
@@ -173,7 +173,6 @@ MmiManage (
   BOOLEAN      WillReturn;
   EFI_STATUS   Status;
 
-  mMmiManageCallingDepth++;
   WillReturn   = FALSE;
   Status       = EFI_NOT_FOUND;
   ReturnStatus = Status;
@@ -198,6 +197,7 @@ MmiManage (
     Head = &MmiEntry->MmiHandlers;
   }
 
+  mMmiManageCallingDepth++;
   for (Link = Head->ForwardLink; Link != Head; Link = Link->ForwardLink) {
     MmiHandler = CR (Link, MMI_HANDLER, Link, MMI_HANDLER_SIGNATURE);
 
diff --git a/StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.c b/StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.c
index e71fc42981c..e658d01a68f 100644
--- a/StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.c
+++ b/StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.c
@@ -551,7 +551,7 @@ CreateMmHobList (
   Status = CreateMmFoundationHobList (
              (UINT8 *)HobList + PhitHobSize + PlatformHobSize,
              &FoundationHobSize,
-             HobList,
+             (UINT8 *)HobList + PhitHobSize,
              PlatformHobSize,
              MmFvBase,
              MmFvSize,