diff --git a/cadquery/cqgi.py b/cadquery/cqgi.py
index 87f2ce917..1e8f54033 100644
--- a/cadquery/cqgi.py
+++ b/cadquery/cqgi.py
@@ -491,19 +491,7 @@ def __init__(self, cq_model):
 
     def handle_assignment(self, var_name, value_node):
         try:
-            if type(value_node) == ast.Num:
-                self.cqModel.add_script_parameter(
-                    InputParameter.create(
-                        value_node, var_name, NumberParameterType, value_node.n
-                    )
-                )
-            elif type(value_node) == ast.Str:
-                self.cqModel.add_script_parameter(
-                    InputParameter.create(
-                        value_node, var_name, StringParameterType, value_node.s
-                    )
-                )
-            elif type(value_node) == ast.Name:
+            if type(value_node) == ast.Name:
                 if value_node.id == "True":
                     self.cqModel.add_script_parameter(
                         InputParameter.create(
@@ -574,7 +562,7 @@ def visit_Assign(self, node):
                 return
 
             # Handle the NamedConstant type that is only present in Python 3
-            astTypes = [ast.Num, ast.Str, ast.Name]
+            astTypes = [ast.Name]
             if hasattr(ast, "NameConstant"):
                 astTypes.append(ast.NameConstant)
 
diff --git a/cadquery/occ_impl/shapes.py b/cadquery/occ_impl/shapes.py
index 70b709883..b5171a88b 100644
--- a/cadquery/occ_impl/shapes.py
+++ b/cadquery/occ_impl/shapes.py
@@ -356,14 +356,14 @@
 inverse_shape_LUT = {v: k for k, v in shape_LUT.items()}
 
 downcast_LUT = {
-    ta.TopAbs_VERTEX: TopoDS.Vertex_s,
-    ta.TopAbs_EDGE: TopoDS.Edge_s,
-    ta.TopAbs_WIRE: TopoDS.Wire_s,
-    ta.TopAbs_FACE: TopoDS.Face_s,
-    ta.TopAbs_SHELL: TopoDS.Shell_s,
-    ta.TopAbs_SOLID: TopoDS.Solid_s,
-    ta.TopAbs_COMPSOLID: TopoDS.CompSolid_s,
-    ta.TopAbs_COMPOUND: TopoDS.Compound_s,
+    ta.TopAbs_VERTEX: TopoDS.Vertex,
+    ta.TopAbs_EDGE: TopoDS.Edge,
+    ta.TopAbs_WIRE: TopoDS.Wire,
+    ta.TopAbs_FACE: TopoDS.Face,
+    ta.TopAbs_SHELL: TopoDS.Shell,
+    ta.TopAbs_SOLID: TopoDS.Solid,
+    ta.TopAbs_COMPSOLID: TopoDS.CompSolid,
+    ta.TopAbs_COMPOUND: TopoDS.Compound,
 }
 
 geom_LUT = {
@@ -894,7 +894,7 @@ def Edges(self) -> List["Edge"]:
         return [
             Edge(i)
             for i in self._entities("Edge")
-            if not BRep_Tool.Degenerated_s(TopoDS.Edge_s(i))
+            if not BRep_Tool.Degenerated_s(TopoDS.Edge(i))
         ]
 
     def Compounds(self) -> List["Compound"]:
@@ -2899,8 +2899,8 @@ def stitch(self, other: "Wire") -> "Wire":
         """Attempt to stitch wires"""
 
         wire_builder = BRepBuilderAPI_MakeWire()
-        wire_builder.Add(TopoDS.Wire_s(self.wrapped))
-        wire_builder.Add(TopoDS.Wire_s(other.wrapped))
+        wire_builder.Add(TopoDS.Wire(self.wrapped))
+        wire_builder.Add(TopoDS.Wire(other.wrapped))
         wire_builder.Build()
 
         return self.__class__(wire_builder.Wire())
@@ -3395,7 +3395,7 @@ def makeFromWires(cls, outerWire: Wire, innerWires: List[Wire] = []) -> "Face":
         # fix outer wire
         sf_s = ShapeFix_Shape(outerWire.wrapped)
         sf_s.Perform()
-        wo = TopoDS.Wire_s(sf_s.Shape())
+        wo = TopoDS.Wire(sf_s.Shape())
 
         face_builder = BRepBuilderAPI_MakeFace(wo, True)
 
@@ -3487,7 +3487,7 @@ def chamfer2D(self, d: float, vertices: Iterable[Vertex]) -> "Face":
             e1, e2 = edges
 
             chamfer_builder.AddChamfer(
-                TopoDS.Edge_s(e1.wrapped), TopoDS.Edge_s(e2.wrapped), d, d
+                tcast(TopoDS_Edge, e1.wrapped), tcast(TopoDS_Edge, e2.wrapped), d, d
             )
 
         chamfer_builder.Build()
@@ -3609,7 +3609,7 @@ def _(self, outer: Wire, *inner: Wire) -> Self:
         bldr = BRepBuilderAPI_MakeFace(self._geomAdaptor(), outer.wrapped)
 
         for w in inner:
-            bldr.Add(TopoDS.Wire_s(w.wrapped))
+            bldr.Add(TopoDS.Wire(w.wrapped))
 
         return self.__class__(bldr.Face()).fix()
 
@@ -3676,9 +3676,7 @@ def addHole(self, *inner: Wire | Edge) -> Self:
         bldr = BRepBuilderAPI_MakeFace(self.wrapped)
 
         for w in inner:
-            bldr.Add(
-                TopoDS.Wire_s(w.wrapped if isinstance(w, Wire) else wire(w).wrapped)
-            )
+            bldr.Add(TopoDS.Wire(w.wrapped if isinstance(w, Wire) else wire(w).wrapped))
 
         return self.__class__(bldr.Face()).fix()
 
@@ -3760,7 +3758,7 @@ def chamfer(
         for e in nativeEdges:
             face = edge_face_map.FindFromKey(e).First()
             chamfer_builder.Add(
-                d1, d2, e, TopoDS.Face_s(face)
+                d1, d2, e, TopoDS.Face(face)
             )  # NB: edge_face_map return a generic TopoDS_Shape
         return self.__class__(chamfer_builder.Shape())
 
@@ -6127,7 +6125,7 @@ def cap(
 
     for e in _get_edges(s):
         f = _get_one(e.ancestors(ctx, "Face"), "Face")
-        builder.Add(e.wrapped, f.wrapped, GeomAbs_G2, True)
+        builder.Add(e.wrapped, f.wrapped, GeomAbs_Shape.GeomAbs_G1, True)
 
     for c in constraints:
         if isinstance(c, Shape):
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 44003ec4a..ec3a07d99 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -16,8 +16,7 @@ requirements:
     - setuptools
   run:
     - python >=3.10
-    - ocp=7.8.1
-    - vtk=*=qt*
+    - ocp=7.9.3.*
     - pyparsing >=2.1.9
     - ezdxf>=1.3.0
     - ipython
diff --git a/environment.yml b/environment.yml
index f30b0fbf5..d7f1e4521 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,8 +4,7 @@ channels:
 dependencies:
   - python>=3.10
   - ipython
-  - ocp=7.8.1
-  - vtk=*=qt*
+  - ocp=7.9.3
   - pyparsing>=2.1.9
   - sphinx=8.1.3
   - sphinx_rtd_theme