diff --git a/src/LayerPlan.cpp b/src/LayerPlan.cpp
index 5e8978c82e..90f98f8111 100644
--- a/src/LayerPlan.cpp
+++ b/src/LayerPlan.cpp
@@ -1235,7 +1235,7 @@ void LayerPlan::addLinesInGivenOrder(const std::vector<PathOrderPath<ConstPolygo
         if (wipe_dist != 0)
         {
             bool wipe = true;
-            int line_width = config.getLineWidth();
+            coord_t line_width = config.getLineWidth();
 
             // Don't wipe if current extrusion is too small
             if (polyline.polylineLength() <= line_width * 2)
@@ -1346,10 +1346,10 @@ void LayerPlan::spiralizeWallSlice(const GCodePathConfig& config, ConstPolygonRe
         }
     }
 
-    const int n_points = wall.size();
+    const size_t n_points = wall.size();
     Polygons last_wall_polygons;
     last_wall_polygons.add(last_wall);
-    const int max_dist2 = config.getLineWidth() * config.getLineWidth() * 4; // (2 * lineWidth)^2;
+    const coord_t max_dist2 = config.getLineWidth() * config.getLineWidth() * 4; // (2 * lineWidth)^2;
 
     double total_length = 0.0; // determine the length of the complete wall
     Point p0 = origin;