diff --git a/render-wasm/src/math.rs b/render-wasm/src/math.rs
index 25e6989184..2d6d06062a 100644
--- a/render-wasm/src/math.rs
+++ b/render-wasm/src/math.rs
@@ -412,7 +412,7 @@ pub fn resize_matrix(
     parent_transform.post_translate(center);
     parent_transform.pre_translate(-center);
 
-    let parent_transform_inv = &parent_transform.invert().unwrap();
+    let parent_transform_inv = &parent_transform.invert().unwrap_or_default();
     let origin = parent_transform_inv.map_point(child_bounds.nw);
 
     let mut scale = Matrix::scale((scale_width, scale_height));
diff --git a/render-wasm/src/shapes/modifiers.rs b/render-wasm/src/shapes/modifiers.rs
index eaf5bbd220..92fd7e69e0 100644
--- a/render-wasm/src/shapes/modifiers.rs
+++ b/render-wasm/src/shapes/modifiers.rs
@@ -115,22 +115,28 @@ fn set_pixel_precision(transform: &mut Matrix, bounds: &mut Bounds) {
     let x = bounds.min_x().round();
     let y = bounds.min_y().round();
 
-    let mut round_transform = Matrix::scale((
-        bounds.width().round() / bounds.width(),
-        bounds.height().round() / bounds.height(),
-    ));
-    round_transform.post_concat(&tr);
-    round_transform.pre_concat(&tr_inv);
+    let scale_width = f32::max(0.01, bounds.width().round() / bounds.width());
+    let scale_height = f32::max(0.01, bounds.height().round() / bounds.height());
 
-    transform.post_concat(&round_transform);
-    bounds.transform_mut(&round_transform);
+    if f32::is_finite(scale_width)
+        && f32::is_finite(scale_height)
+        && (!math::is_close_to(scale_width, 1.0) || !math::is_close_to(scale_height, 1.0))
+    {
+        let mut round_transform = Matrix::scale((scale_width, scale_height));
+        round_transform.post_concat(&tr);
+        round_transform.pre_concat(&tr_inv);
+        transform.post_concat(&round_transform);
+        bounds.transform_mut(&round_transform);
+    }
 
     let dx = x - bounds.min_x();
     let dy = y - bounds.min_y();
 
-    let round_transform = Matrix::translate((dx, dy));
-    transform.post_concat(&round_transform);
-    bounds.transform_mut(&round_transform);
+    if f32::is_finite(dx) && f32::is_finite(dy) {
+        let round_transform = Matrix::translate((dx, dy));
+        transform.post_concat(&round_transform);
+        bounds.transform_mut(&round_transform);
+    }
 }
 
 pub fn propagate_modifiers(
diff --git a/render-wasm/src/shapes/modifiers/constraints.rs b/render-wasm/src/shapes/modifiers/constraints.rs
index c764201007..1a838c0a9a 100644
--- a/render-wasm/src/shapes/modifiers/constraints.rs
+++ b/render-wasm/src/shapes/modifiers/constraints.rs
@@ -11,26 +11,26 @@ pub fn calculate_resize(
 ) -> Option<(f32, f32)> {
     let scale_width = match constraint_h {
         ConstraintH::Left | ConstraintH::Right | ConstraintH::Center => {
-            parent_before.width() / parent_after.width()
+            parent_before.width() / f32::max(0.01, parent_after.width())
         }
         ConstraintH::LeftRight => {
             let left = parent_before.left(child_before.nw);
             let right = parent_before.right(child_before.ne);
             let target_width = parent_after.width() - left - right;
-            target_width / child_after.width()
+            target_width / f32::max(0.01, child_after.width())
         }
         _ => 1.0,
     };
 
     let scale_height = match constraint_v {
         ConstraintV::Top | ConstraintV::Bottom | ConstraintV::Center => {
-            parent_before.height() / parent_after.height()
+            parent_before.height() / f32::max(0.01, parent_after.height())
         }
         ConstraintV::TopBottom => {
             let top = parent_before.top(child_before.nw);
             let bottom = parent_before.bottom(child_before.sw);
             let target_height = parent_after.height() - top - bottom;
-            target_height / child_after.height()
+            target_height / f32::max(0.01, child_after.height())
         }
         _ => 1.0,
     };
diff --git a/render-wasm/src/shapes/modifiers/flex_layout.rs b/render-wasm/src/shapes/modifiers/flex_layout.rs
index 8e7a47a456..1d26392146 100644
--- a/render-wasm/src/shapes/modifiers/flex_layout.rs
+++ b/render-wasm/src/shapes/modifiers/flex_layout.rs
@@ -269,7 +269,11 @@ fn initialize_tracks(
 // Resize main axis fill
 fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut [TrackData]) {
     for track in tracks.iter_mut() {
-        let mut left_space = layout_axis.main_space() - track.main_size;
+        let mut left_space = if layout_axis.is_auto_main {
+            0.0
+        } else {
+            layout_axis.main_space() - track.main_size
+        };
         let mut to_resize_children: Vec<&mut ChildAxis> = Vec::new();
 
         for child in track.shapes.iter_mut() {
@@ -299,7 +303,13 @@ fn distribute_fill_main_space(layout_axis: &LayoutAxis, tracks: &mut [TrackData]
 fn distribute_fill_across_space(layout_axis: &LayoutAxis, tracks: &mut [TrackData]) {
     let total_across_size = tracks.iter().map(|t| t.across_size).sum::<f32>()
         + (tracks.len() - 1) as f32 * layout_axis.gap_across;
-    let mut left_space = layout_axis.across_space() - total_across_size;
+
+    let mut left_space = if layout_axis.is_auto_across {
+        0.0
+    } else {
+        layout_axis.across_space() - total_across_size
+    };
+
     let mut to_resize_tracks: Vec<&mut TrackData> = Vec::new();
 
     for track in tracks.iter_mut() {
@@ -435,13 +445,8 @@ fn calculate_track_data(
         structure,
     );
 
-    if !layout_axis.is_auto_main {
-        distribute_fill_main_space(&layout_axis, &mut tracks);
-    }
-
-    if !layout_axis.is_auto_across {
-        distribute_fill_across_space(&layout_axis, &mut tracks);
-    }
+    distribute_fill_main_space(&layout_axis, &mut tracks);
+    distribute_fill_across_space(&layout_axis, &mut tracks);
 
     let total_across_size = tracks.iter().map(|t| t.across_size).sum::<f32>();