diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 218156b58d..6d8b4cd2bf 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -967,7 +967,7 @@
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdStatusCodeReplayInOEM</C_Name>
-      <Token>0x0001002c</Token>
+      <Token>0x0001002d</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>BOOLEAN</DatumType>
       <ValidUsage>FEATURE_FLAG</ValidUsage>
@@ -976,7 +976,7 @@
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdStatusCodeRuntimeMemorySize</C_Name>
-      <Token>0x0001002d</Token>
+      <Token>0x0001002e</Token>
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>UINT16</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index 9f1f922269..e65294f370 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -170,7 +170,7 @@ SerialStatusCodeReportWorker (
     //
     // Callout to SerialPort Lib function to do print.
     //
-    SerialPortWrite (Buffer, CharCount);
+    SerialPortWrite ((UINT8 *) Buffer, CharCount);
   }
   if (FeaturePcdGet (PcdStatusCodeUseEfiSerial)) {
     SerialIoProtocol->Write (
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
index fc22b624ec..049e4ef778 100644
--- a/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/SerialStatusCodeWorker.c
@@ -141,7 +141,7 @@ SerialStatusCodeReportWorker (
   //
   // Callout to SerialPort Lib function to do print.
   //
-  SerialPortWrite (Buffer, CharCount);
+  SerialPortWrite ((UINT8 *) Buffer, CharCount);
 
   return EFI_SUCCESS;
 }