diff --git a/traceon/_typing/__init__.py b/traceon/_typing/__init__.py
index f730815..b64207d 100644
--- a/traceon/_typing/__init__.py
+++ b/traceon/_typing/__init__.py
@@ -1,4 +1,4 @@
-from future import __annotations__
+from __future__ import annotations
 
 from ._array_like import(
     ArrayFloat, ArrayFloat1D, ArrayFloat2D, ArrayFloat3D, ArrayFloat4D, ArrayFloat5D,
diff --git a/traceon/mesher.py b/traceon/mesher.py
index 974775c..867de64 100644
--- a/traceon/mesher.py
+++ b/traceon/mesher.py
@@ -1054,7 +1054,7 @@ def _subdivide_quads(pstack: PointStack,
         else: # We are done, both sides are within mesh size limits
             quads.append((depth, i0, i1, j0, j1))
 
-def _mesh_subsections_to_quads(surface: Surface, mesh_size: float, start_depth: int) -> tuple[Points3D, list[PointStack], Quads]:
+def _mesh_subsections_to_quads(surface: Surface, mesh_size: float, start_depth: int) -> tuple[list[Point3D], list[PointStack], list[QuadsLike]]:
     all_pstacks = []
     all_quads = []
     points: list[Point3D] = []
@@ -1071,7 +1071,7 @@ def _mesh_subsections_to_quads(surface: Surface, mesh_size: float, start_depth:
         all_quads.append(quads)
         points = pstack.points
 
-    return np.array(points), all_pstacks, np.array(all_quads)
+    return points, all_pstacks, all_quads
     
 def _copy_over_edge(e1: ArrayInt1D, e2: ArrayInt1D) -> None:
     assert e1.shape == e2.shape
diff --git a/traceon/util.py b/traceon/util.py
index 8c3063e..14abc7f 100644
--- a/traceon/util.py
+++ b/traceon/util.py
@@ -7,7 +7,7 @@
 from .backend import DEBUG
 from . import logging
 
-from ._typing import *
+from .typing import *
 
 class Saveable:
     def write(self, filename: str) -> None: