diff --git a/Source/Objects/ArrayObject.h b/Source/Objects/ArrayObject.h
index 0109f5e71..9a7694361 100644
--- a/Source/Objects/ArrayObject.h
+++ b/Source/Objects/ArrayObject.h
@@ -86,7 +86,7 @@ class GraphicalArray final : public Component
         auto const* pointPtr = points.data();
         auto const numPoints = points.size();
         
-        StackArray<float, 6> control;
+        StackArray<float, 6> control = {0};
         Path result;
         if (std::isfinite(pointPtr[0])) {
             result.startNewSubPath(0, pointPtr[0]);
diff --git a/Source/Objects/FunctionObject.h b/Source/Objects/FunctionObject.h
index 90a939102..7ab376b63 100644
--- a/Source/Objects/FunctionObject.h
+++ b/Source/Objects/FunctionObject.h
@@ -252,7 +252,7 @@ class FunctionObject final : public ObjectBase {
         triggerOutput();
     }
 
-    std::pair<float, float> getRange() const
+    Range<float> getRange() const
     {
         auto const& arr = *range.getValue().getArray();
 
@@ -271,17 +271,17 @@ class FunctionObject final : public ObjectBase {
 
         return { start, end };
     }
-    void setRange(std::pair<float, float> const& newRange)
+    void setRange(Range<float> const& newRange)
     {
         auto const& arr = *range.getValue().getArray();
-        arr[0] = newRange.first;
-        arr[1] = newRange.second;
+        arr[0] = newRange.getStart();
+        arr[1] = newRange.getEnd();
 
         if (auto function = ptr.get<t_fake_function>()) {
-            if (newRange.first <= function->x_min_point)
-                function->x_min = newRange.first;
-            if (newRange.second >= function->x_max_point)
-                function->x_max = newRange.second;
+            if (newRange.getStart() <= function->x_min_point)
+                function->x_min = newRange.getStart();
+            if (newRange.getEnd() >= function->x_max_point)
+                function->x_max = newRange.getEnd();
         }
     }