diff --git a/Source/Engine/Scripting/BinaryModule.cpp b/Source/Engine/Scripting/BinaryModule.cpp
index 667f41d85..8f1bb27d0 100644
--- a/Source/Engine/Scripting/BinaryModule.cpp
+++ b/Source/Engine/Scripting/BinaryModule.cpp
@@ -1012,8 +1012,7 @@ void ManagedBinaryModule::InitType(MClass* mclass)
 
     baseType.Module->TypeNameToTypeIndex.TryGet(baseClass->GetFullName(), *(int32*)&baseType.TypeIndex);
 
-    // So we must special case this flow of a generic class of which its possible the generic base class is not 
-    // in the same module
+    // So we must special case this flow of a generic class of which its possible the generic base class is not in the same module
     if (baseType.TypeIndex == -1 && baseClass->IsGeneric())
     {
         auto genericNameIndex = baseClass->GetFullName().FindLast('`');
diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
index 5cbb9b661..c64ee38b3 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
@@ -208,7 +208,6 @@ namespace Flax.Build
             {
 #if USE_NETCORE
                 dotnetPath = Path.Combine(dotnetSdk.RootPath, "dotnet");
-
                 cscPath = Path.Combine(dotnetSdk.RootPath, $"sdk/{dotnetSdk.VersionName}/Roslyn/bincore/csc.dll");
                 referenceAssemblies = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/ref/net{runtimeVersionShort}/");
                 referenceAnalyzers = Path.Combine(dotnetSdk.RootPath, $"packs/Microsoft.NETCore.App.Ref/{dotnetSdk.RuntimeVersionName}/analyzers/dotnet/cs/");
diff --git a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
index fd2eb354d..dee92d384 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
@@ -213,11 +213,10 @@ namespace Flax.Build
                 if (string.IsNullOrEmpty(dotnetPath))
                     dotnetPath = "/usr/local/share/dotnet/";
 
-                // So there is not a real great way to do this but if the first thing in this list is x64
-                // then lets assume we are building for it and thus should using that rid and that dotnet path
+                // Use x64 when cross-compiling from ARM64
                 if (architecture == TargetArchitecture.ARM64 && (Configuration.BuildArchitectures != null && Configuration.BuildArchitectures[0] == TargetArchitecture.x64))
                 {
-                    rid = $"osx-x64";
+                    rid = "osx-x64";
                     dotnetPath = Path.Combine(dotnetPath, "x64");
                     architecture = TargetArchitecture.x64;
                 }