diff --git a/Source/Engine/Renderer/Editor/LightmapUVsDensity.h b/Source/Engine/Renderer/Editor/LightmapUVsDensity.h
index 67c9d24ea..70a7b1b0e 100644
--- a/Source/Engine/Renderer/Editor/LightmapUVsDensity.h
+++ b/Source/Engine/Renderer/Editor/LightmapUVsDensity.h
@@ -24,6 +24,9 @@ private:
 public:
 
     LightmapUVsDensityMaterialShader();
+    virtual ~LightmapUVsDensityMaterialShader()
+    {
+    }
 
 private:
 
diff --git a/Source/Engine/Renderer/Editor/VertexColors.h b/Source/Engine/Renderer/Editor/VertexColors.h
index f92803cad..5ee726789 100644
--- a/Source/Engine/Renderer/Editor/VertexColors.h
+++ b/Source/Engine/Renderer/Editor/VertexColors.h
@@ -22,6 +22,9 @@ private:
 public:
 
     VertexColorsMaterialShader();
+    virtual ~VertexColorsMaterialShader()
+    {
+    }
 
 private:
 
diff --git a/Source/ThirdParty/glslang/glslang.Build.cs b/Source/ThirdParty/glslang/glslang.Build.cs
index 8aebd2d84..141b2d675 100644
--- a/Source/ThirdParty/glslang/glslang.Build.cs
+++ b/Source/ThirdParty/glslang/glslang.Build.cs
@@ -24,12 +24,20 @@ public class glslang : DepsModule
         base.Setup(options);
 
         var depsRoot = options.DepsFolder;
-        options.OutputFiles.Add(Path.Combine(depsRoot, "GenericCodeGen.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "glslang.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "HLSL.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "MachineIndependent.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "OSDependent.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "OGLCompiler.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV.lib"));
+        switch (options.Platform.Target)
+        {
+        case TargetPlatform.Windows:
+            options.OutputFiles.Add(Path.Combine(depsRoot, "GenericCodeGen.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "glslang.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "HLSL.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "MachineIndependent.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "OSDependent.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "OGLCompiler.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV.lib"));
+            break;
+        case TargetPlatform.Linux:
+            break;
+        default: throw new InvalidPlatformException(options.Platform.Target);
+        }
     }
 }
diff --git a/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs b/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs
index 9cafe2d50..4318317d9 100644
--- a/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs
+++ b/Source/ThirdParty/spirv-tools/spirv_tools.Build.cs
@@ -25,7 +25,15 @@ public class spirv_tools : DepsModule
         base.Setup(options);
 
         var depsRoot = options.DepsFolder;
-        options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools.lib"));
-        options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools-opt.lib"));
+        switch (options.Platform.Target)
+        {
+        case TargetPlatform.Windows:
+            options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools.lib"));
+            options.OutputFiles.Add(Path.Combine(depsRoot, "SPIRV-Tools-opt.lib"));
+            break;
+        case TargetPlatform.Linux:
+            break;
+        default: throw new InvalidPlatformException(options.Platform.Target);
+        }
     }
 }
diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
index 3f088ffdf..9ea37c01e 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
@@ -536,6 +536,7 @@ namespace Flax.Build.Bindings
                     if (apiType.IsStruct && !apiType.IsPod)
                     {
                         // Use wrapper structure that represents the memory layout of the managed data
+                        needLocalVariable = true;
                         if (!CppUsedNonPodTypes.Contains(apiType))
                             CppUsedNonPodTypes.Add(apiType);
                         type = apiType.Name + "Managed";