diff --git a/src/RhinoAPI.targets b/src/RhinoAPI.targets
index 65348b9bf..9f2557049 100644
--- a/src/RhinoAPI.targets
+++ b/src/RhinoAPI.targets
@@ -9,7 +9,7 @@
 
   <PropertyGroup Condition="$(Configuration.Contains('R8'))">
     <RhinoVersion>8</RhinoVersion>
-    <RhinoApiVersion>8.0.23304.9001</RhinoApiVersion>
+    <RhinoApiVersion>8.1.23325.13001</RhinoApiVersion>
     <DefineConstants>$(DefineConstants);RHINO_7;RHINO_8</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/RhinoInside.Revit.GH/Types/GraphicalElement.cs b/src/RhinoInside.Revit.GH/Types/GraphicalElement.cs
index 90455ca72..45901bf9a 100644
--- a/src/RhinoInside.Revit.GH/Types/GraphicalElement.cs
+++ b/src/RhinoInside.Revit.GH/Types/GraphicalElement.cs
@@ -9,6 +9,7 @@
 using ERDB = RhinoInside.Revit.External.DB;
 #if RHINO_8
 using Grasshopper.Rhinoceros;
+using Grasshopper.Rhinoceros.Model;
 #endif
 
 namespace RhinoInside.Revit.GH.Types
@@ -394,9 +395,9 @@ public override bool CastTo<Q>(out Q target)
       }
 
 #if RHINO_8
-      if (typeof(Q).IsAssignableFrom(typeof(ModelContent)))
+      if (typeof(Q).IsAssignableFrom(typeof(ModelObject)))
       {
-        target = (Q) (object) ToModelContent(new Dictionary<ARDB.ElementId, ModelContent>());
+        target = (Q) (object) (ToModelContent(new Dictionary<ARDB.ElementId, ModelContent>()) as ModelObject);
         return true;
       }
 #endif
diff --git a/src/RhinoInside.Revit.Loader/Loader.cs b/src/RhinoInside.Revit.Loader/Loader.cs
index 73aa3aaf2..3b300408f 100644
--- a/src/RhinoInside.Revit.Loader/Loader.cs
+++ b/src/RhinoInside.Revit.Loader/Loader.cs
@@ -46,11 +46,11 @@ static Distribution PickDistribution()
     {
       var distributions = new Distribution[]
       {
-        new Distribution(7),
         new Distribution(8),
+        new Distribution(7),
 #if DEBUG
-        new Distribution(7, dev: true),
         new Distribution(8, dev: true),
+        new Distribution(7, dev: true),
 #endif
       };
 
@@ -68,7 +68,7 @@ static Distribution PickDistribution()
           TitleAutoPrefix = true,
           AllowCancellation = false,
           MainInstruction = "Looks like you have many supported Rhino versions installed.",
-          MainContent = "Please pick which one you want to use.",
+          MainContent = "Please pick which one you want to use in this Revit session.",
           //VerificationText = "Do not show again"
         }
       )
diff --git a/src/RhinoInside.Revit/Core.cs b/src/RhinoInside.Revit/Core.cs
index 896695acf..16dc4b3b7 100755
--- a/src/RhinoInside.Revit/Core.cs
+++ b/src/RhinoInside.Revit/Core.cs
@@ -303,7 +303,7 @@ internal static ARUI.Result CheckSetup()
             MainIcon = ERUI.TaskDialogIcons.IconError,
             AllowCancellation = true,
             MainInstruction = "Unsupported Rhino version",
-            MainContent = $"Expected Rhino version is ({MinimumRhinoVersion}) or above.",
+            MainContent = $"Expected Rhino version is ({MinimumRhinoVersion.Major}.{MinimumRhinoVersion.Minor}) or above.",
             ExpandedContent =
             (Distribution.VersionInfo is null ? "Rhino\n" :
             $"{Distribution.VersionInfo.ProductName} {Distribution.VersionInfo.ProductMajorPart}\n") +