diff --git a/Sources/armory/trait/internal/JSScript.hx b/Sources/armory/trait/internal/JSScript.hx
index fa0de3d5..dc7fb75e 100644
--- a/Sources/armory/trait/internal/JSScript.hx
+++ b/Sources/armory/trait/internal/JSScript.hx
@@ -21,7 +21,8 @@ class JSScript extends Trait {
 			var src = header + blob.toString();
 #if js
 			if (api == null) api = new JSScriptAPI();
-			untyped __js__("let self = {0}; eval(src);", object);
+			untyped __js__("var self = {0};", object);
+			untyped __js__("eval(src);");
 #end
 		});
 	}
diff --git a/blender/armutils.py b/blender/armutils.py
index ce4f6528..2ab412bf 100755
--- a/blender/armutils.py
+++ b/blender/armutils.py
@@ -42,6 +42,9 @@ def get_sdk_path():
         if get_os() == 'mac':
             # blender.app/Contents/MacOS/blender
             return bpy.app.binary_path[:-34] + '/armsdk/'
+        elif get_os() == 'linux':
+            # blender
+            return bpy.app.binary_path[:-7] + '/armsdk/'
         else:
             # blender.exe
             return bpy.app.binary_path[:-11] + '/armsdk/'
diff --git a/blender/make_logic.py b/blender/make_logic.py
index 32097af8..1a356b23 100755
--- a/blender/make_logic.py
+++ b/blender/make_logic.py
@@ -31,7 +31,7 @@ def build_node_tree(node_group):
     with open(path + node_group_name + '.hx', 'w') as f:
         f.write('package ' + bpy.data.worlds['Arm'].arm_project_package + '.node;\n\n')
         f.write('import armory.logicnode.*;\n\n')
-        f.write('class ' + node_group_name + ' extends armory.trait.internal.NodeExecutor {\n\n')
+        f.write('@:keep class ' + node_group_name + ' extends armory.trait.internal.NodeExecutor {\n\n')
         f.write('\tpublic function new() { super(); notifyOnAdd(add); }\n\n')
         f.write('\tfunction add() {\n')
         # Make sure root node exists