diff --git a/Application/BootKicker/BootKicker.c b/Application/BootKicker/BootKicker.c
index 3d5be2a0..e6bbbccc 100644
--- a/Application/BootKicker/BootKicker.c
+++ b/Application/BootKicker/BootKicker.c
@@ -41,7 +41,7 @@ UefiMain (
 
   gBS->SetWatchdogTimer (0, 0, 0, NULL);
 
-  OcProvideConsoleGop ();
+  OcProvideConsoleGop (FALSE);
 
   OcSetConsoleResolution (0, 0, 0);
 
diff --git a/Application/ChipTune/ChipTune.c b/Application/ChipTune/ChipTune.c
index 22021bc9..9dcfad34 100644
--- a/Application/ChipTune/ChipTune.c
+++ b/Application/ChipTune/ChipTune.c
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <Uefi.h>
 #include <Library/BaseMemoryLib.h>
-#include <Library/DebugLib.h>
+#include <Library/OcDebugLogLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/OcConsoleLib.h>
 #include <Library/OcMiscLib.h>
@@ -69,7 +69,7 @@ UefiMain (
 
   gBS->SetWatchdogTimer (0, 0, 0, NULL);
 
-  OcProvideConsoleGop ();
+  OcProvideConsoleGop (FALSE);
 
   OcConsoleControlSetMode (EfiConsoleControlScreenText);
 
diff --git a/Include/Library/OcConfigurationLib.h b/Include/Library/OcConfigurationLib.h
index 088d887e..e8967936 100644
--- a/Include/Library/OcConfigurationLib.h
+++ b/Include/Library/OcConfigurationLib.h
@@ -475,10 +475,10 @@ typedef enum {
   _(BOOLEAN                     , PointerSupport     ,     , FALSE                         , ()) \
   _(OC_STRING                   , PointerSupportMode ,     , OC_STRING_CONSTR ("", _, __)  , OC_DESTR (OC_STRING)) \
   _(UINT32                      , TimerResolution    ,     , 0                             , ())
-OC_DECLARE (OC_UEFI_INPUT)
+  OC_DECLARE (OC_UEFI_INPUT)
 
 ///
-/// Input is a set of options to support advanced output.
+/// Output is a set of options to support advanced output.
 ///
 #define OC_UEFI_OUTPUT_FIELDS(_, __) \
   _(OC_STRING                   , ConsoleMode                 ,     , OC_STRING_CONSTR ("", _, __), OC_DESTR (OC_STRING)) \
@@ -491,7 +491,7 @@ OC_DECLARE (OC_UEFI_INPUT)
   _(BOOLEAN                     , ReconnectOnResChange        ,     , FALSE  , ()) \
   _(BOOLEAN                     , SanitiseClearScreen         ,     , FALSE  , ()) \
   _(BOOLEAN                     , DirectGopRendering          ,     , FALSE  , ())
-OC_DECLARE (OC_UEFI_OUTPUT)
+  OC_DECLARE (OC_UEFI_OUTPUT)
 
 ///
 /// Prefer own protocol implementation for these protocols.
diff --git a/Include/Library/OcConsoleLib.h b/Include/Library/OcConsoleLib.h
index 27cb1f59..20717f18 100644
--- a/Include/Library/OcConsoleLib.h
+++ b/Include/Library/OcConsoleLib.h
@@ -131,7 +131,7 @@ OcSetConsoleMode (
 **/
 VOID
 OcProvideConsoleGop (
-  VOID
+  IN BOOLEAN  Route
   );
 
 /**
diff --git a/Include/Library/OcHdaDevicesLib.h b/Include/Library/OcHdaDevicesLib.h
index 77dc521d..938377ea 100644
--- a/Include/Library/OcHdaDevicesLib.h
+++ b/Include/Library/OcHdaDevicesLib.h
@@ -84,4 +84,3 @@ OcHdaCodecGetName (
   );
 
 #endif // OC_HDA_DEVICES_LIB_H
-
diff --git a/Include/Protocol/AudioIo.h b/Include/Protocol/AudioIo.h
index 32fa4713..d68376b4 100644
--- a/Include/Protocol/AudioIo.h
+++ b/Include/Protocol/AudioIo.h
@@ -78,21 +78,21 @@ typedef enum {
   Port surface.
 **/
 typedef enum {
-    EfiAudioIoSurfaceExternal = 0,
-    EfiAudioIoSurfaceInternal,
-    EfiAudioIoSurfaceOther,
-    EfiAudioIoSurfaceMaximum
+  EfiAudioIoSurfaceExternal,
+  EfiAudioIoSurfaceInternal,
+  EfiAudioIoSurfaceOther,
+  EfiAudioIoSurfaceMaximum
 } EFI_AUDIO_IO_PROTOCOL_SURFACE;
 
 /**
   Size in bits of each sample.
 **/
 typedef enum {
-    EfiAudioIoBits8     = BIT0,
-    EfiAudioIoBits16    = BIT1,
-    EfiAudioIoBits20    = BIT2,
-    EfiAudioIoBits24    = BIT3,
-    EfiAudioIoBits32    = BIT4
+  EfiAudioIoBits8     = BIT0,
+  EfiAudioIoBits16    = BIT1,
+  EfiAudioIoBits20    = BIT2,
+  EfiAudioIoBits24    = BIT3,
+  EfiAudioIoBits32    = BIT4
 } EFI_AUDIO_IO_PROTOCOL_BITS;
 
 /**
diff --git a/Library/OcConsoleLib/ConsoleGop.c b/Library/OcConsoleLib/ConsoleGop.c
index f6d34eaf..c5e119b0 100644
--- a/Library/OcConsoleLib/ConsoleGop.c
+++ b/Library/OcConsoleLib/ConsoleGop.c
@@ -71,7 +71,7 @@ ConsoleHandleProtocol (
 
 VOID
 OcProvideConsoleGop (
-  VOID
+  IN BOOLEAN  Route
   )
 {
   EFI_STATUS                    Status;
@@ -85,10 +85,12 @@ OcProvideConsoleGop (
   // Shell may replace gST->ConsoleOutHandle, so we have to ensure
   // that HandleProtocol always reports valid chosen GOP.
   //
-  mOriginalHandleProtocol  = gBS->HandleProtocol;
-  gBS->HandleProtocol      = ConsoleHandleProtocol;
-  gBS->Hdr.CRC32           = 0;
-  gBS->CalculateCrc32 (gBS, gBS->Hdr.HeaderSize, &gBS->Hdr.CRC32);
+  if (Route) {
+    mOriginalHandleProtocol  = gBS->HandleProtocol;
+    gBS->HandleProtocol      = ConsoleHandleProtocol;
+    gBS->Hdr.CRC32           = 0;
+    gBS->CalculateCrc32 (gBS, gBS->Hdr.HeaderSize, &gBS->Hdr.CRC32);
+  }
 
   OriginalGop = NULL;
   Status = gBS->HandleProtocol (