diff --git a/Source/Editor/Cooker/Steps/DeployDataStep.cpp b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
index 5d7416080..9f95dbdb5 100644
--- a/Source/Editor/Cooker/Steps/DeployDataStep.cpp
+++ b/Source/Editor/Cooker/Steps/DeployDataStep.cpp
@@ -229,6 +229,8 @@ bool DeployDataStep::Perform(CookingData& data)
                         srcDotnetLibs /= TEXT("../lib/net8.0");
                     }
                 }
+                LOG(Info, "Copying .NET files from {} to {}", packFolder, dstDotnet);
+                LOG(Info, "Copying .NET files from {} to {}", srcDotnetLibs, dstDotnetLibs);
                 FileSystem::CopyFile(dstDotnet / TEXT("LICENSE.TXT"), packFolder / TEXT("LICENSE.txt"));
                 FileSystem::CopyFile(dstDotnet / TEXT("LICENSE.TXT"), packFolder / TEXT("LICENSE.TXT"));
                 FileSystem::CopyFile(dstDotnet / TEXT("THIRD-PARTY-NOTICES.TXT"), packFolder / TEXT("ThirdPartyNotices.txt"));
diff --git a/Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs b/Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs
index 8a7050c9c..0775e66da 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetAOT.cs
@@ -309,7 +309,7 @@ namespace Flax.Build
                 // Peek class library folder
                 var coreLibPaths = Directory.GetFiles(aotAssembliesPath, "System.Private.CoreLib.dll", SearchOption.AllDirectories);
                 if (coreLibPaths.Length != 1)
-                    throw new Exception("Invalid C# class library setup in " + aotAssembliesPath);
+                    throw new Exception($"Invalid C# class library setup in '{aotAssembliesPath}' (missing C# dll files)");
                 var dotnetLibPath = Utilities.NormalizePath(Path.GetDirectoryName(coreLibPaths[0]));
                 Log.Info("Class library found in: " + dotnetLibPath);
 
diff --git a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs
index 1fcbb6ded..f5eed36d7 100644
--- a/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependencies/nethost.cs
@@ -30,6 +30,7 @@ namespace Flax.Deps.Dependencies
                     return new[]
                     {
                         TargetPlatform.PS4,
+                        TargetPlatform.Switch,
                     };
                 case TargetPlatform.Linux:
                     return new[]
@@ -254,7 +255,8 @@ namespace Flax.Deps.Dependencies
             Utilities.Run("cmake", "--version", null, null, Utilities.RunOptions.ThrowExceptionOnError);
 
             // Get the source
-            CloneGitRepo(root, "https://github.com/FlaxEngine/dotnet-runtime.git", "flax-master", null, true);
+            CloneGitRepo(root, "https://github.com/FlaxEngine/dotnet-runtime.git", null, null, true);
+            GitCheckout(root, "flax-master");
             SetupDirectory(Path.Combine(root, "src", "external"), false);
 
             /*
@@ -285,6 +287,9 @@ namespace Flax.Deps.Dependencies
                 case TargetPlatform.Android:
                     Build(options, platform, TargetArchitecture.ARM64);
                     break;
+                case TargetPlatform.Switch:
+                    Build(options, platform, TargetArchitecture.ARM64);
+                    break;
                 }
             }
 
diff --git a/Source/Tools/Flax.Build/Deps/Dependency.cs b/Source/Tools/Flax.Build/Deps/Dependency.cs
index 4e940c824..bcc5ce056 100644
--- a/Source/Tools/Flax.Build/Deps/Dependency.cs
+++ b/Source/Tools/Flax.Build/Deps/Dependency.cs
@@ -140,11 +140,8 @@ namespace Flax.Deps
                 if (submodules)
                     Utilities.Run("git", "submodule update --init --recursive", null, null, Utilities.RunOptions.DefaultTool);
             }
-
             if (commit != null)
-            {
                 Utilities.Run("git", string.Format("reset --hard {0}", commit), null, null, Utilities.RunOptions.DefaultTool);
-            }
         }
 
         /// <summary>