diff --git a/armorpaint/sources/make_material.ts b/armorpaint/sources/make_material.ts
index 45ee67b3..00392c9b 100644
--- a/armorpaint/sources/make_material.ts
+++ b/armorpaint/sources/make_material.ts
@@ -296,7 +296,8 @@ function make_material_traverse_nodes(nodes: ui_node_t[], group: ui_node_canvas_
 		if (node.type == "GROUP") {
 			for (let j: i32 = 0; j < project_material_groups.length; ++j) {
 				let g: node_group_t = project_material_groups[j];
-				if (g.canvas.name == node.name) {
+				let cname: string = g.canvas.name;
+				if (cname == node.name) {
 					array_push(parents, node);
 					make_material_traverse_nodes(g.canvas.nodes, g.canvas, parents);
 					array_pop(parents);
diff --git a/armorpaint/sources/make_paint.ts b/armorpaint/sources/make_paint.ts
index 4a3cf29c..177cebdb 100644
--- a/armorpaint/sources/make_paint.ts
+++ b/armorpaint/sources/make_paint.ts
@@ -266,15 +266,15 @@ function make_paint_run(data: material_t, matcon: material_context_t): node_shad
 		if (context_raw.material.paint_subs) {
 			node_shader_write(frag, "float subs = " + subs + ";");
 		}
-		if (parse_float(height) != 0.0 && !make_material_height_used) {
+		if (height != "0.0" && height != "0" && !make_material_height_used) {
 			make_material_height_used = true;
 			// Height used for the first time, also rebuild vertex shader
 			return make_paint_run(data, matcon);
 		}
-		if (parse_float(emis) != 0.0) {
+		if (emis != "0.0" && emis != "0") {
 			make_material_emis_used = true;
 		}
-		if (parse_float(subs) != 0.0) {
+		if (subs != "0.0" && subs != "0") {
 			make_material_subs_used = true;
 		}
 	}
diff --git a/armorpaint/sources/tab_layers.ts b/armorpaint/sources/tab_layers.ts
index 8c82e5e0..73df1b40 100644
--- a/armorpaint/sources/tab_layers.ts
+++ b/armorpaint/sources/tab_layers.ts
@@ -185,7 +185,8 @@ function tab_layers_combo_filter() {
 	if (filter_handle.changed) {
 		for (let i: i32 = 0; i < project_paint_objects.length; ++i) {
 			let p: mesh_object_t = project_paint_objects[i];
-			p.base.visible = context_raw.layer_filter == 0 || p.base.name == ar[context_raw.layer_filter] || project_is_atlas_object(p);
+			let filter_name: string = ar[context_raw.layer_filter];
+			p.base.visible = context_raw.layer_filter == 0 || p.base.name == filter_name || project_is_atlas_object(p);
 		}
 		if (context_raw.layer_filter == 0 && context_raw.merged_object_is_atlas) { // All
 			util_mesh_merge();
diff --git a/armorsculpt/sources/import_mesh.ts b/armorsculpt/sources/import_mesh.ts
index 61595860..d8fe4355 100644
--- a/armorsculpt/sources/import_mesh.ts
+++ b/armorsculpt/sources/import_mesh.ts
@@ -182,7 +182,8 @@ function import_mesh_add_mesh(mesh: raw_mesh_t) {
 	// Ensure unique names
 	for (let i: i32 = 0; i < project_paint_objects.length; ++i) {
 		let p: mesh_object_t = project_paint_objects[i];
-		if (p.base.name == object.base.name) {
+		let oname: string = object.base.name;
+		if (p.base.name == oname) {
 			p.base.name += ".001";
 			p.data._.handle += ".001";
 			map_set(data_cached_meshes, p.data._.handle, p.data);
diff --git a/armorsculpt/sources/make_material.ts b/armorsculpt/sources/make_material.ts
index a770b94d..57d06311 100644
--- a/armorsculpt/sources/make_material.ts
+++ b/armorsculpt/sources/make_material.ts
@@ -293,7 +293,8 @@ function make_material_traverse_nodes(nodes: ui_node_t[], group: ui_node_canvas_
 		if (node.type == "GROUP") {
 			for (let j: i32 = 0; j < project_material_groups.length; ++j) {
 				let g: node_group_t = project_material_groups[j];
-				if (g.canvas.name == node.name) {
+				let cname: string = g.canvas.name;
+				if (cname == node.name) {
 					array_push(parents, node);
 					make_material_traverse_nodes(g.canvas.nodes, g.canvas, parents);
 					array_pop(parents);
diff --git a/base/sources/base.ts b/base/sources/base.ts
index d1fbcb81..d4d5ae7e 100644
--- a/base/sources/base.ts
+++ b/base/sources/base.ts
@@ -2222,7 +2222,8 @@ function base_set_object_mask() {
 		let o: mesh_object_t = project_paint_objects[0];
 		for (let i: i32 = 0; i < project_paint_objects.length; ++i) {
 			let p: mesh_object_t = project_paint_objects[i];
-			if (p.base.name == ar[mask]) {
+			let mask_name: string = ar[mask];
+			if (p.base.name == mask_name) {
 				o = p;
 				break;
 			}
diff --git a/base/sources/import_arm.ts b/base/sources/import_arm.ts
index b260928e..530a1270 100644
--- a/base/sources/import_arm.ts
+++ b/base/sources/import_arm.ts
@@ -502,7 +502,8 @@ function import_arm_run_material_from_project(project: project_format_t, path: s
 function import_arm_group_exists(c: ui_node_canvas_t): bool {
 	for (let i: i32 = 0; i < project_material_groups.length; ++i) {
 		let g: node_group_t = project_material_groups[i];
-		if (g.canvas.name == c.name) {
+		let cname: string = g.canvas.name;
+		if (cname == c.name) {
 			return true;
 		}
 	}
diff --git a/base/sources/import_mesh.ts b/base/sources/import_mesh.ts
index b0207e22..c98f9ddd 100644
--- a/base/sources/import_mesh.ts
+++ b/base/sources/import_mesh.ts
@@ -223,7 +223,8 @@ function _import_mesh_add_mesh(mesh: raw_mesh_t) {
 	// Ensure unique names
 	for (let i: i32 = 0; i < project_paint_objects.length; ++i) {
 		let p: mesh_object_t = project_paint_objects[i];
-		if (p.base.name == object.base.name) {
+		let oname: string = object.base.name;
+		if (p.base.name == oname) {
 			p.base.name += ".001";
 			p.data._.handle += ".001";
 			map_set(data_cached_meshes, p.data._.handle, p.data);
diff --git a/base/sources/project.ts b/base/sources/project.ts
index fcf58139..fad0ad42 100644
--- a/base/sources/project.ts
+++ b/base/sources/project.ts
@@ -764,7 +764,8 @@ function project_is_material_group_in_use(group: node_group_t): bool {
 		let canvas: ui_node_canvas_t = canvases[i];
 		for (let i: i32 = 0; i < canvas.nodes.length; ++i) {
 			let n: ui_node_t = canvas.nodes[i];
-			if (n.type == "GROUP" && n.name == group.canvas.name) {
+			let cname: string = group.canvas.name;
+			if (n.type == "GROUP" && n.name == cname) {
 				return true;
 			}
 		}
diff --git a/base/sources/ui_nodes.ts b/base/sources/ui_nodes.ts
index 7e4bb756..ae9032db 100644
--- a/base/sources/ui_nodes.ts
+++ b/base/sources/ui_nodes.ts
@@ -1490,7 +1490,8 @@ function ui_nodes_make_group_node(group_canvas: ui_node_canvas_t, nodes: ui_node
 	let group_output: ui_node_t = null;
 	for (let i: i32 = 0; i < project_material_groups.length; ++i) {
 		let g: node_group_t = project_material_groups[i];
-		if (g.canvas.name == node.name) {
+		let cname: string = g.canvas.name;
+		if (cname == node.name) {
 			for (let i: i32 = 0; i < g.canvas.nodes.length; ++i) {
 				let n: ui_node_t = g.canvas.nodes[i];
 				if (n.type == "GROUP_INPUT") {