diff --git a/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs b/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs
index ff0288ffe1..30c21fce96 100644
--- a/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceControllerTypeCollection.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.Mvc
     // which we are not doing at the moment
     // we can inherit from BuilderCollectionBase and just be enumerable
 
-    internal class SurfaceControllerTypeCollection : BuilderCollectionBase<Type>
+    public class SurfaceControllerTypeCollection : BuilderCollectionBase<Type>
     {
         public SurfaceControllerTypeCollection(IEnumerable<Type> items)
             : base(items)
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
index a35d381d70..e7abdfa533 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComponent.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Web.Runtime
 {
     public class WebRuntimeComponent : IComponent
     {
-        internal WebRuntimeComponent(
+        public WebRuntimeComponent(
             IRuntimeState runtime,
             IUmbracoContextAccessor umbracoContextAccessor,
             SurfaceControllerTypeCollection surfaceControllerTypes,
diff --git a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
index 4cc502e011..66357cb435 100644
--- a/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntimeComposer.cs
@@ -40,6 +40,8 @@ namespace Umbraco.Web.Runtime
     {
         public void Compose(Composition composition)
         {
+            composition.Components().Append<WebRuntimeComponent>();
+
             composition.Register<UmbracoInjectedModule>();
 
             composition.RegisterUnique<IHttpContextAccessor, AspNetHttpContextAccessor>(); // required for hybrid accessors
diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs
index c5c7f9dd2a..cdb1aa2f51 100644
--- a/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs
+++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerTypeCollection.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Web.WebApi
     // which we are not doing at the moment
     // we can inherit from BuilderCollectionBase and just be enumerable
 
-    internal class UmbracoApiControllerTypeCollection : BuilderCollectionBase<Type>
+    public class UmbracoApiControllerTypeCollection : BuilderCollectionBase<Type>
     {
         public UmbracoApiControllerTypeCollection(IEnumerable<Type> items)
             : base(items)