diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
index 5e8c9b4c43..58c793dae6 100644
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
@@ -288,7 +288,7 @@ SetMemoryEncDec (
     if (!PageMapLevel4Entry->Bits.Present) {
       DEBUG ((
         DEBUG_WARN,
-        "%a:%a: ERROR bad PML4 for %lx\n",
+        "%a:%a: ERROR bad PML4 for Physical=0x%Lx\n",
         gEfiCallerBaseName,
         __FUNCTION__,
         PhysicalAddress
@@ -301,7 +301,7 @@ SetMemoryEncDec (
     if (!PageDirectory1GEntry->Bits.Present) {
       DEBUG ((
         DEBUG_WARN,
-        "%a:%a: ERROR bad PDPE for %lx\n",
+        "%a:%a: ERROR bad PDPE for Physical=0x%Lx\n",
         gEfiCallerBaseName,
         __FUNCTION__,
         PhysicalAddress
@@ -321,7 +321,7 @@ SetMemoryEncDec (
         SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode);
         DEBUG ((
           DEBUG_VERBOSE,
-          "%a:%a: Updated 1GB entry for %lx\n",
+          "%a:%a: Updated 1GB entry for Physical=0x%Lx\n",
           gEfiCallerBaseName,
           __FUNCTION__,
           PhysicalAddress
@@ -334,9 +334,10 @@ SetMemoryEncDec (
         //
         DEBUG ((
           DEBUG_VERBOSE,
-          "%a:%a: Spliting 1GB page\n",
+          "%a:%a: Spliting 1GB page for Physical=0x%Lx\n",
           gEfiCallerBaseName,
-          __FUNCTION__
+          __FUNCTION__,
+          PhysicalAddress
           ));
         Split1GPageTo2M(((UINT64)PageDirectory1GEntry->Bits.PageTableBaseAddress)<<30, (UINT64*) PageDirectory1GEntry, 0, 0);
         continue;
@@ -351,7 +352,7 @@ SetMemoryEncDec (
       if (!PageDirectory2MEntry->Bits.Present) {
         DEBUG ((
           DEBUG_WARN,
-          "%a:%a: ERROR bad PDE for %lx\n",
+          "%a:%a: ERROR bad PDE for Physical=0x%Lx\n",
           gEfiCallerBaseName,
           __FUNCTION__,
           PhysicalAddress
@@ -376,7 +377,7 @@ SetMemoryEncDec (
           //
           DEBUG ((
             DEBUG_VERBOSE,
-            "%a:%a: Spliting 2MB page at %lx\n",
+            "%a:%a: Spliting 2MB page for Physical=0x%Lx\n",
             gEfiCallerBaseName,
             __FUNCTION__,
             PhysicalAddress
@@ -391,7 +392,7 @@ SetMemoryEncDec (
         if (!PageTableEntry->Bits.Present) {
           DEBUG ((
             DEBUG_WARN,
-            "%a:%a: ERROR bad PTE for %lx\n",
+            "%a:%a: ERROR bad PTE for Physical=0x%Lx\n",
             gEfiCallerBaseName,
             __FUNCTION__,
             PhysicalAddress