diff --git a/UIX/CommonExtensions.cs b/UIX/CommonExtensions.cs
index 4a7d719..1da1616 100644
--- a/UIX/CommonExtensions.cs
+++ b/UIX/CommonExtensions.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-internal static class CommonExtensions
+public static class CommonExtensions
 {
     /// <inheritdoc cref="SerializationInfo.GetValue(string, Type)"/>
     public static T GetValue<T>(this SerializationInfo info, string name)
diff --git a/UIX/Microsoft/Iris/Markup/CreateLoadResultHandler.cs b/UIX/Microsoft/Iris/Markup/CreateLoadResultHandler.cs
index 8af4ce4..7f73d5e 100644
--- a/UIX/Microsoft/Iris/Markup/CreateLoadResultHandler.cs
+++ b/UIX/Microsoft/Iris/Markup/CreateLoadResultHandler.cs
@@ -6,5 +6,5 @@
 
 namespace Microsoft.Iris.Markup
 {
-    internal delegate LoadResult CreateLoadResultHandler(string uri);
+    public delegate LoadResult CreateLoadResultHandler(string uri);
 }
diff --git a/UIX/Microsoft/Iris/Markup/ErrorLoadResult.cs b/UIX/Microsoft/Iris/Markup/ErrorLoadResult.cs
index 5e2b46a..f5b4333 100644
--- a/UIX/Microsoft/Iris/Markup/ErrorLoadResult.cs
+++ b/UIX/Microsoft/Iris/Markup/ErrorLoadResult.cs
@@ -9,14 +9,14 @@ using System;
 namespace Microsoft.Iris.Markup
 {
     [Serializable]
-    internal class ErrorLoadResult : LoadResult
+    public class ErrorLoadResult : LoadResult
     {
         public ErrorLoadResult(string uri)
           : base(uri)
         {
         }
 
-        public override TypeSchema FindType(string name) => (TypeSchema)null;
+        public override TypeSchema FindType(string name) => null;
 
         public override LoadResultStatus Status => LoadResultStatus.Error;
     }
diff --git a/UIX/Microsoft/Iris/Markup/MarkupSystem.cs b/UIX/Microsoft/Iris/Markup/MarkupSystem.cs
index 8631afa..8c8f0c9 100644
--- a/UIX/Microsoft/Iris/Markup/MarkupSystem.cs
+++ b/UIX/Microsoft/Iris/Markup/MarkupSystem.cs
@@ -184,7 +184,7 @@ namespace Microsoft.Iris.Markup
 
         public static void UnloadAll() => LoadResultCache.Clear();
 
-        internal static bool RegisterFactoryByProtocol(string protocol, CreateLoadResultHandler handler)
+        public static bool RegisterFactoryByProtocol(string protocol, CreateLoadResultHandler handler)
         {
             if (protocol.EndsWith("://", StringComparison.Ordinal))
                 protocol = protocol.Substring(0, protocol.Length - 3);
@@ -207,7 +207,7 @@ namespace Microsoft.Iris.Markup
             return flag;
         }
 
-        internal static bool RegisterFactoryByExtension(string extension, CreateLoadResultHandler handler)
+        public static bool RegisterFactoryByExtension(string extension, CreateLoadResultHandler handler)
         {
             bool flag = true;
             if (!extension.StartsWith(".", StringComparison.Ordinal))
diff --git a/UIX/Microsoft/Iris/Session/ErrorManager.cs b/UIX/Microsoft/Iris/Session/ErrorManager.cs
index 3a64b24..d61c216 100644
--- a/UIX/Microsoft/Iris/Session/ErrorManager.cs
+++ b/UIX/Microsoft/Iris/Session/ErrorManager.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 
 namespace Microsoft.Iris.Session
 {
-    internal static class ErrorManager
+    public static class ErrorManager
     {
         private static uint s_totalErrorsReported;
         private static Stack<ErrorManager.Context> s_contextStack = new Stack<ErrorManager.Context>();
diff --git a/UIX/Microsoft/Iris/Session/ErrorWatermark.cs b/UIX/Microsoft/Iris/Session/ErrorWatermark.cs
index 3895a38..080bdf7 100644
--- a/UIX/Microsoft/Iris/Session/ErrorWatermark.cs
+++ b/UIX/Microsoft/Iris/Session/ErrorWatermark.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Iris.Session
 {
-    internal struct ErrorWatermark
+    public struct ErrorWatermark
     {
         private uint _currentErrorCount;
 
diff --git a/UIX/Microsoft/Iris/Session/IErrorContextSource.cs b/UIX/Microsoft/Iris/Session/IErrorContextSource.cs
index 4012347..01a4514 100644
--- a/UIX/Microsoft/Iris/Session/IErrorContextSource.cs
+++ b/UIX/Microsoft/Iris/Session/IErrorContextSource.cs
@@ -6,7 +6,7 @@
 
 namespace Microsoft.Iris.Session
 {
-    internal interface IErrorContextSource
+    public interface IErrorContextSource
     {
         string GetErrorContextDescription();
 
diff --git a/UIX/Microsoft/Iris/Session/NotifyErrorBatch.cs b/UIX/Microsoft/Iris/Session/NotifyErrorBatch.cs
index 4cc6784..f152533 100644
--- a/UIX/Microsoft/Iris/Session/NotifyErrorBatch.cs
+++ b/UIX/Microsoft/Iris/Session/NotifyErrorBatch.cs
@@ -8,5 +8,5 @@ using System.Collections;
 
 namespace Microsoft.Iris.Session
 {
-    internal delegate void NotifyErrorBatch(IList errors);
+    public delegate void NotifyErrorBatch(IList errors);
 }