diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 8579ce7e09..c83da0c071 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -66,9 +66,9 @@ class CuraApplication(QtApplication):
     Q_ENUMS(ResourceTypes)
 
     def __init__(self):
-        Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura"))
+        Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources"))
         if not hasattr(sys, "frozen"):
-            Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), ".."))
+            Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources"))
 
         self._open_file_queue = []  # Files to open when plug-ins are loaded.
 
diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py
index 59a802045a..7a5d332d9e 100644
--- a/plugins/CuraEngineBackend/CuraEngineBackend.py
+++ b/plugins/CuraEngineBackend/CuraEngineBackend.py
@@ -200,8 +200,10 @@ class CuraEngineBackend(Backend):
         self._onChanged()
 
     def _onSocketError(self, error):
-        super()._onSocketError(error)
+        if Application.getInstance().isShuttingDown():
+            return
 
+        super()._onSocketError(error)
         self._terminate()
 
         if error.getErrorCode() not in [Arcus.ErrorCode.BindFailedError, Arcus.ErrorCode.ConnectionResetError, Arcus.ErrorCode.Debug]:
diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json
index dc851770cf..1db6182601 100644
--- a/resources/machines/fdmprinter.json
+++ b/resources/machines/fdmprinter.json
@@ -552,7 +552,7 @@
                             "default": 2,
                             "min_value": "0",
                             "visible": false,
-                            "inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density"
+                            "inherit_function": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else 1))"
                         }
                     }
                 },
@@ -1237,7 +1237,7 @@
                             "default": 2.66,
                             "visible": false,
                             "enabled": "support_enable",
-                            "inherit_function": "(support_line_width * 100) / parent_value",
+                            "inherit_function": "(support_line_width * 100) / parent_value * (2 if support_pattern == \"grid\" else (3 if support_pattern == \"triangles\" else 1))",
                             "global_only": true
                         }
                     }
@@ -1372,7 +1372,7 @@
                             "default": 0.4,
                             "min_value": "0",
                             "visible": false,
-                            "inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value",
+                            "inherit_function": "0 if parent_value == 0 else (support_roof_line_width * 100) / parent_value * (2 if support_roof_pattern == \"grid\" else (3 if support_roof_pattern == \"triangles\" else 1))",
                             "enabled": "support_roof_enable",
                             "global_only": true
                         }