diff --git a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
index d6e91d687d..7832f3781d 100644
--- a/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
+++ b/EdkModulePkg/Library/EdkSerialPortLibNull/SerialPortLibNull.c
@@ -46,8 +46,8 @@ SerialPortInitialize (
 UINTN
 EFIAPI
 SerialPortWrite (
-  IN UINT8 	   *Buffer,
-  IN UINTN 	   NumberOfBytes
+  IN UINT8     *Buffer,
+  IN UINTN     NumberOfBytes
 )
 {
   return 0;
@@ -70,8 +70,8 @@ SerialPortWrite (
 UINTN
 EFIAPI
 SerialPortRead (
-  OUT UINT8 	*Buffer,
-  IN  UINTN 	NumberOfBytes
+  OUT UINT8     *Buffer,
+  IN  UINTN     NumberOfBytes
 )
 {
   return 0;
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
index 06a4814375..730a231c0b 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/Common/DxeStatusCodeCommon.c
@@ -131,6 +131,9 @@ DxeStatusCodeDriverEntry (
                         Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  
                         The contents of this data type may have additional GUID-specific data.  The standard GUIDs and 
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.
+
+  @return               Always return EFI_SUCCESS.
+
 **/
 EFI_STATUS 
 EFIAPI
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index 11793b52ae..91da14d007 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -67,30 +67,11 @@ AcquireRecordBuffer (
 
   @param   Record        Point to record buffer which is acquired by AcquirRecordBuffer()
  
-  @retval  EFI_SUCCESS   If DataRecord is valid.
-  @retval  !EFI_SUCCESS  The record list has empty.
-
 **/
 VOID
 FreeRecordBuffer (
   IN  DATAHUB_STATUSCODE_RECORD  *Record
   )
-/*++
-
-Routine Description:
-
-  Release a mRecordBuffer entry allocated by AquireEmptyRecordBuffer ().
-
-Arguments:
-
-  RecordBuffer          - Data to free
-
-Returns:
-
-  EFI_SUCCESS           - If DataRecord is valid
-  EFI_UNSUPPORTED       - The record list has empty
-
---*/
 {
   ASSERT (Record != NULL);
   ASSERT (mNumberOfRecords != 0);
@@ -222,7 +203,7 @@ LogDataHubEventCallBack (
   )
 {
   DATAHUB_STATUSCODE_RECORD         *Record;
-  UINTN                             Size;
+  UINT32                            Size;
   UINT64                            DataRecordClass;
   LIST_ENTRY                        *Node;
 
@@ -238,7 +219,7 @@ LogDataHubEventCallBack (
     //
     // Add in the size of the header we added.
     //
-    Size = sizeof (DATAHUB_STATUSCODE_RECORD) + Record->Data.Size;
+    Size = sizeof (DATAHUB_STATUSCODE_RECORD) + (UINT32) Record->Data.Size;
 
     if ((Record->CodeType & EFI_STATUS_CODE_TYPE_MASK) == EFI_PROGRESS_CODE) {
       DataRecordClass = EFI_DATA_RECORD_CLASS_PROGRESS_CODE;
@@ -266,7 +247,7 @@ LogDataHubEventCallBack (
                         &gEfiStatusCodeRuntimeProtocolGuid,
                         DataRecordClass,
                         Record,
-                        (UINT32) Size
+                        Size
                         );
 
     FreeRecordBuffer (Record);
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
index c119cf751b..c47d34bc23 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.c
@@ -22,7 +22,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
 
-  Module Name:  StatusCode.c
+  Module Name:  DxeStatusCode.c
 
 **/
 
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index 3eb28b19b9..7c76f8b324 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -111,6 +111,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Protocol Usage="ALWAYS_CONSUMED">
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>
     </Protocol>
+    <Protocol Usage="ALWAYS_CONSUMED">
+      <ProtocolCName>gEfiStatusCodeRuntimeProtocolGuid</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Guids> 
     <GuidCNames Usage="SOMETIMES_CONSUMED">
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
index a5fbf23678..69e3e10757 100644
--- a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c
@@ -32,10 +32,10 @@ EfiSerialStatusCodeInitializeWorker (
   EFI_STATUS Status;
 
   Status = gBS->LocateProtocol (
-            &gEfiSerialIoProtocolGuid,
-            NULL,
-            (VOID **) &mSerialIoProtocol
-            );
+             &gEfiSerialIoProtocolGuid,
+             NULL,
+             (VOID **) &mSerialIoProtocol
+             );
 
   ASSERT_EFI_ERROR (Status);
 
diff --git a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
index bbe16c70cb..2ef75041f4 100644
--- a/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
+++ b/EdkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.c
@@ -89,6 +89,9 @@ EFI_PEI_PPI_DESCRIPTOR        mStatusCodePpiDescriptor = {
                         Type EFI_STATUS_CODE_DATA is defined in "Related Definitions" below.  
                         The contents of this data type may have additional GUID-specific data.  The standard GUIDs and 
                         their associated data structures are defined in the Intel? Platform Innovation Framework for EFI Status Codes Specification.
+
+  @return               Always return EFI_SUCCESS.
+
 **/
 EFI_STATUS
 EFIAPI