diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index 3a3cee948a..0ab460b02c 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -161,12 +161,12 @@ STATIC
 VOID
 DumpGTBlock (
   IN UINT8* Ptr,
-  IN UINT16 Length
+  IN UINT32 Length
   )
 {
   UINT32 Index;
   UINT32 Offset;
-  UINT16 GTBlockTimerLength;
+  UINT32 GTBlockTimerLength;
 
   Offset = ParseAcpi (
              TRUE,
diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
index 99521cd67a..a5e1412484 100644
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Xsdt/XsdtParser.c
@@ -96,7 +96,7 @@ ParseAcpiXsdt (
       CONST UINT8*  Revision;
 
       if ((UINT64*)(UINTN)(*TablePointer) != NULL) {
-        UINT8*      Ptr;
+        UINT8*      SignaturePtr;
 
         ParseAcpiHeader (
           (UINT8*)(UINTN)(*TablePointer),
@@ -105,17 +105,17 @@ ParseAcpiXsdt (
           &Revision
           );
 
-        Ptr = (UINT8*)Signature;
+        SignaturePtr = (UINT8*)Signature;
 
         UnicodeSPrint (
           Buffer,
           sizeof (Buffer),
           L"Entry[%d] - %c%c%c%c",
           EntryIndex++,
-          Ptr[0],
-          Ptr[1],
-          Ptr[2],
-          Ptr[3]
+          SignaturePtr[0],
+          SignaturePtr[1],
+          SignaturePtr[2],
+          SignaturePtr[3]
           );
       } else {
         UnicodeSPrint (