diff --git a/Library/OcSerializeLib/OcSerializeLib.c b/Library/OcSerializeLib/OcSerializeLib.c
index 343c920a832eeef0895074db343c2b179abca951..7a5476a1e2a38475d7631871c27e86ffb320669a 100644
--- a/Library/OcSerializeLib/OcSerializeLib.c
+++ b/Library/OcSerializeLib/OcSerializeLib.c
@@ -20,6 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
 
+#if !defined(MDEPKG_NDEBUG)
+
 STATIC
 CONST CHAR8 *
 mSchemaTypeNames[] = {
@@ -42,6 +44,8 @@ GetSchemaTypeName (
   return "custom";
 }
 
+#endif
+
 OC_SCHEMA *
 LookupConfigSchema (
   IN OC_SCHEMA      *SortedList,
diff --git a/Platform/OpenCanopy/OpenCanopy.c b/Platform/OpenCanopy/OpenCanopy.c
index af76bc271324d46f9565fb012d82775d7262aca9..92091fb52e5ea66299d329fe1ee231974a20c952 100644
--- a/Platform/OpenCanopy/OpenCanopy.c
+++ b/Platform/OpenCanopy/OpenCanopy.c
@@ -956,7 +956,7 @@ GuiRedrawAndFlushScreen (
 
 EFI_STATUS
 GuiLibConstruct (
-  IN OC_PICKER_CONTEXT  *PickerContet,
+  IN OC_PICKER_CONTEXT  *PickerContext,
   IN UINT32             CursorDefaultX,
   IN UINT32             CursorDefaultY
   )
@@ -976,7 +976,7 @@ GuiLibConstruct (
   CursorDefaultY = MIN (CursorDefaultY, OutputInfo->VerticalResolution   - 1);
 
   mPointerContext = GuiPointerConstruct (
-    PickerContet,
+    PickerContext,
     CursorDefaultX,
     CursorDefaultY,
     OutputInfo->HorizontalResolution,
@@ -986,7 +986,7 @@ GuiLibConstruct (
     DEBUG ((DEBUG_WARN, "OCUI: Failed to initialise pointer\n"));
   }
 
-  mKeyContext = GuiKeyConstruct (PickerContet);
+  mKeyContext = GuiKeyConstruct (PickerContext);
   if (mKeyContext == NULL) {
     DEBUG ((DEBUG_WARN, "OCUI: Failed to initialise key input\n"));
   }
diff --git a/Platform/OpenCanopy/OpenCanopy.h b/Platform/OpenCanopy/OpenCanopy.h
index 19b9a7a50a921d60f57d33f05f98bb8bde685f6c..8a0e411b09b3a662d7fad7c385f0771d07472150 100644
--- a/Platform/OpenCanopy/OpenCanopy.h
+++ b/Platform/OpenCanopy/OpenCanopy.h
@@ -264,7 +264,7 @@ GuiClearScreen (
 
 EFI_STATUS
 GuiLibConstruct (
-  IN OC_PICKER_CONTEXT  *PickerContet,
+  IN OC_PICKER_CONTEXT  *PickerContext,
   IN UINT32             CursorDefaultX,
   IN UINT32             CursorDefaultY
   );