diff --git a/src/libslic3r/Algorithm/LineSplit.cpp b/src/libslic3r/Algorithm/LineSplit.cpp
index c532e08349..f63033c026 100644
--- a/src/libslic3r/Algorithm/LineSplit.cpp
+++ b/src/libslic3r/Algorithm/LineSplit.cpp
@@ -264,7 +264,7 @@ SplittedLine do_split_line(const ClipperZUtils::ZPath& path, const ExPolygons& c
             }
             for (const auto segment : node) {
                 for (const ClipperZUtils::ZPoint& sp : *segment) {
-                    assert(!is_clip(sp.z()));
+                    assert(!is_clip(sp));
                     result.emplace_back(to_point(sp), true, sp.z());
                 }
                 result.back().clipped = false; // Mark the end of the clipped line
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index fe8ff61018..d1e6d9b3bf 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -2785,7 +2785,7 @@ std::vector<size_t> ModelVolume::get_extruders_from_multi_material_painting() co
      if (!this->is_mm_painted())
          return {};
 
-     assert(static_cast<size_t>(TriangleStateType::Extruder1) - 1 == 0);
+     assert(static_cast<size_t>(EnforcerBlockerType::Extruder1) - 1 == 0);
      const TriangleSelector::TriangleSplittingData &data = this->mmu_segmentation_facets.get_data();
 
      std::vector<size_t> extruders;
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index d7812e6b42..9456c6049f 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -5440,9 +5440,9 @@ void PrintConfigDef::init_extruder_option_keys()
         "retract_lift_above",
         "retract_lift_below",
         "retract_lift_enforce",
+        "retract_on_top_layer",
         "retract_restart_extra",
         "retract_when_changing_layer",
-        "retract_on_top_layer",
         "retraction_distances_when_cut",
         "retraction_length",
         "retraction_minimum_travel",