diff --git a/src/libslic3r/SLA/SupportIslands/ExpandNeighbor.cpp b/src/libslic3r/SLA/SupportIslands/ExpandNeighbor.cpp
index aacef93809..260ab27436 100644
--- a/src/libslic3r/SLA/SupportIslands/ExpandNeighbor.cpp
+++ b/src/libslic3r/SLA/SupportIslands/ExpandNeighbor.cpp
@@ -20,7 +20,7 @@ void ExpandNeighbor::process(CallStack &call_stack)
     if (circle_opt.has_value()) {
         size_t circle_index = data.result.circles.size();
         data.circle_indexes.push_back(circle_index);
-        data.result.circles.push_back(circle_opt.value());
+        data.result.circles.push_back(*circle_opt);
         return;
     }
 
diff --git a/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp b/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp
index e1222a7c99..3f8d7c877a 100644
--- a/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp
+++ b/src/libslic3r/SLA/SupportIslands/VoronoiGraphUtils.cpp
@@ -252,7 +252,7 @@ Slic3r::Polygon VoronoiGraphUtils::to_polygon(const VD::cell_type & cell,
             continue;
         if (orientation == Geometry::Orientation::ORIENTATION_CW)
             std::swap(line->a, line->b);
-        lines.push_back(line.value());
+        lines.push_back(*line);
     } while ((edge = edge->next()) && edge != cell.incident_edge());
     assert(!lines.empty());
     LineUtils::sort_CCW(lines, center);
diff --git a/tests/libslic3r/test_voronoi.cpp b/tests/libslic3r/test_voronoi.cpp
index f6fc6a94c8..142abbb5fa 100644
--- a/tests/libslic3r/test_voronoi.cpp
+++ b/tests/libslic3r/test_voronoi.cpp
@@ -2181,8 +2181,8 @@ TEST_CASE("bad vertex cause overflow of data type precisin when use VD result",
     for (auto& edge : vd.edges()) {
         size_t i1 = edge.cell()->source_index();
         size_t i2 = edge.twin()->cell()->source_index();
-        if (i1 == bad_index0 && i2 == bad_index1 ||
-            i1 == bad_index1 && i2 == bad_index0) {
+        if ((i1 == bad_index0 && i2 == bad_index1) ||
+            (i1 == bad_index1 && i2 == bad_index0)) {
             Vec2d p1 = points[bad_index0].cast<double>();
             Vec2d p2 = points[bad_index1].cast<double>();
             Vec2d middle = (p1 + p2) / 2;