diff --git a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/RevitConverterModule.cs b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/RevitConverterModule.cs
index 7002de82af..60c5050217 100644
--- a/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/RevitConverterModule.cs
+++ b/DUI3-DX/Converters/Revit/Speckle.Converters.Revit2023.DependencyInjection/RevitConverterModule.cs
@@ -1,6 +1,5 @@
 using Autodesk.Revit.DB;
 using Speckle.Autofac.DependencyInjection;
-using Speckle.Converters.Common;
 using Speckle.Converters.Common.DependencyInjection;
 using Speckle.Converters.RevitShared;
 using Speckle.Converters.RevitShared.Helpers;
@@ -13,7 +12,7 @@ public class RevitConverterModule : ISpeckleModule
 {
   public void Load(SpeckleContainerBuilder builder)
   {
-    builder.AddConverterCommon<RootToSpeckleConverter, RevitToSpeckleUnitConverter, ForgeTypeId>();
+    builder.AddConverterCommon<RevitRootToHostConverter, RevitToSpeckleUnitConverter, ForgeTypeId>();
     builder.AddSingleton(new RevitContext());
 
     // POC: do we need ToSpeckleScalingService as is, do we need to interface it out?
diff --git a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToSpeckle/Raw/BrepToSpeckleConverter.cs b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToSpeckle/Raw/BrepToSpeckleConverter.cs
index 236653d4d7..e74bb2f374 100644
--- a/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToSpeckle/Raw/BrepToSpeckleConverter.cs
+++ b/DUI3-DX/Converters/Rhino/Speckle.Converters.Rhino7/ToSpeckle/Raw/BrepToSpeckleConverter.cs
@@ -128,8 +128,8 @@ public SOG.Brep Convert(RG.Brep target)
             speckleParent,
             edge.EdgeCurveIndex,
             edge.TrimIndices(),
-            edge.StartVertex?.VertexIndex ?? -1,
-            edge.EndVertex?.VertexIndex ?? -1,
+            edge.StartVertex.VertexIndex,
+            edge.EndVertex.VertexIndex,
             edge.ProxyCurveIsReversed,
             _intervalConverter.Convert(edge.Domain)
           )
@@ -142,7 +142,7 @@ public SOG.Brep Convert(RG.Brep target)
       {
         var t = new SOG.BrepTrim(
           speckleParent,
-          trim.Edge?.EdgeIndex ?? -1,
+          trim.Edge.EdgeIndex,
           trim.Face.FaceIndex,
           trim.Loop.LoopIndex,
           trim.TrimCurveIndex,