diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index b053789019..b0010a6f9b 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -277,7 +277,7 @@ GetFormSetGuid (
     switch (OpCode->OpCode) {
     case EFI_IFR_FORM_SET_OP:
       FormSet = (EFI_IFR_FORM_SET *) OpCode;
-      CopyGuid (FormSetGuid, &FormSet->Guid);
+      CopyMem (FormSetGuid, &FormSet->Guid, sizeof (EFI_GUID));
       return;
       
       default:
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
index 2c5a3201e7..154297b61e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Include/EdkIIGlueConfig.h
@@ -87,7 +87,7 @@ Abstract:
 //
 // debug print level
 //
-#define EDKII_GLUE_DebugPrintErrorLevel         EFI_D_ERROR
+#define EDKII_GLUE_DebugPrintErrorLevel         EFI_D_ERROR|EFI_D_INFO
 
 //
 // debug propery mask
@@ -96,7 +96,6 @@ Abstract:
                                                   | DEBUG_PROPERTY_DEBUG_PRINT_ENABLED               \
                                                   | DEBUG_PROPERTY_DEBUG_CODE_ENABLED                \
                                                   | DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED              \
-                                                  | DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED         \
                                                   | DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED           \
                                                )
 
diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
index 0526d22073..ffc105a087 100644
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c
@@ -85,7 +85,10 @@ InternalReportStatusCode (
     //
     return (gStatusCode->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);
   } else {
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)
     return (gRT->ReportStatusCode) (Type, Value, Instance, (EFI_GUID *)CallerId, Data);
+#endif
+    return EFI_UNSUPPORTED;
   }
 
 }