diff --git a/PSReadLine/ConsoleLib.cs b/PSReadLine/ConsoleLib.cs
index 67e814e..58cf9c3 100644
--- a/PSReadLine/ConsoleLib.cs
+++ b/PSReadLine/ConsoleLib.cs
@@ -775,7 +775,7 @@ namespace Microsoft.PowerShell.Internal
             var consoleHandle = _outputHandle.Value;
             try
             {
-                CONSOLE_FONT_INFO_EX fontInfo = ConhostConsole.GetConsoleFontInfo(consoleHandle);
+                CONSOLE_FONT_INFO_EX fontInfo = GetConsoleFontInfo(consoleHandle);
                 int fontType = fontInfo.FontFamily & NativeMethods.FontTypeMask;
                 _trueTypeInUse = (fontType & NativeMethods.TrueTypeFont) == NativeMethods.TrueTypeFont;
             }
diff --git a/PSReadLine/Options.cs b/PSReadLine/Options.cs
index c2ac165..b9c1845 100644
--- a/PSReadLine/Options.cs
+++ b/PSReadLine/Options.cs
@@ -287,7 +287,7 @@ namespace Microsoft.PowerShell
         /// <summary>
         /// Return all bound key handlers.
         /// </summary>
-        public static IEnumerable<Microsoft.PowerShell.KeyHandler> GetKeyHandlers()
+        public static IEnumerable<PowerShell.KeyHandler> GetKeyHandlers()
         {
             return GetKeyHandlers(includeBound: true, includeUnbound: false);
         }
@@ -296,7 +296,7 @@ namespace Microsoft.PowerShell
         /// Helper function for the Get-PSReadlineKeyHandler cmdlet.
         /// </summary>
         /// <returns></returns>
-        public static IEnumerable<Microsoft.PowerShell.KeyHandler> GetKeyHandlers(bool includeBound, bool includeUnbound)
+        public static IEnumerable<PowerShell.KeyHandler> GetKeyHandlers(bool includeBound, bool includeUnbound)
         {
             var boundFunctions = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
@@ -310,7 +310,7 @@ namespace Microsoft.PowerShell
                 boundFunctions.Add(entry.Value.BriefDescription);
                 if (includeBound)
                 {
-                    yield return new Microsoft.PowerShell.KeyHandler
+                    yield return new PowerShell.KeyHandler
                     {
                         Key = entry.Key.ToGestureString(),
                         Function = entry.Value.BriefDescription,
@@ -332,7 +332,7 @@ namespace Microsoft.PowerShell
                     boundFunctions.Add(entry.Value.BriefDescription);
                     if (includeBound)
                     {
-                        yield return new Microsoft.PowerShell.KeyHandler
+                        yield return new PowerShell.KeyHandler
                         {
                             Key = "<" + entry.Key.ToGestureString() + ">",
                             Function = entry.Value.BriefDescription,
@@ -349,7 +349,7 @@ namespace Microsoft.PowerShell
                     boundFunctions.Add( secondEntry.Value.BriefDescription );
                     if (includeBound)
                     {
-                        yield return new Microsoft.PowerShell.KeyHandler
+                        yield return new PowerShell.KeyHandler
                         {
                             Key = entry.Key.ToGestureString() + "," + secondEntry.Key.ToGestureString(),
                             Function = secondEntry.Value.BriefDescription,
@@ -373,7 +373,7 @@ namespace Microsoft.PowerShell
                         boundFunctions.Add(secondEntry.Value.BriefDescription);
                         if (includeBound)
                         {
-                            yield return new Microsoft.PowerShell.KeyHandler
+                            yield return new PowerShell.KeyHandler
                             {
                                 Key = "<" + entry.Key.ToGestureString() + "," + secondEntry.Key.ToGestureString() + ">",
                                 Function = secondEntry.Value.BriefDescription,
@@ -402,7 +402,7 @@ namespace Microsoft.PowerShell
 
                     if (!boundFunctions.Contains(method.Name))
                     {
-                        yield return new Microsoft.PowerShell.KeyHandler
+                        yield return new PowerShell.KeyHandler
                         {
                             Key = "Unbound",
                             Function = method.Name,
diff --git a/PSReadLine/ScreenCapture.cs b/PSReadLine/ScreenCapture.cs
index 6f213d1..b7868a3 100644
--- a/PSReadLine/ScreenCapture.cs
+++ b/PSReadLine/ScreenCapture.cs
@@ -32,7 +32,7 @@ namespace Microsoft.PowerShell
             int selectionTop = _singleton._console.CursorTop;
             int selectionHeight = 1;
             int currentY = selectionTop;
-            Internal.IConsole console = _singleton._console;
+            IConsole console = _singleton._console;
 
             // We'll keep the current selection line (currentY) at least 4 lines
             // away from the top or bottom of the window.