diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index f6d140e0e..b3f9ce05a 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -447,6 +447,8 @@ namespace FlaxEditor.Modules
 
         private void StateMachineOnStateChanged()
         {
+            if (Editor.StateMachine.CurrentState is States.ClosingState)
+                return;
             UpdateToolstrip();
             UpdateStatusBar();
         }
diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs
index cbe211eca..e6b9fac2e 100644
--- a/Source/Editor/Windows/GameCookerWindow.cs
+++ b/Source/Editor/Windows/GameCookerWindow.cs
@@ -648,7 +648,7 @@ namespace FlaxEditor.Windows
         /// <returns>True if can build, otherwise false.</returns>
         public bool CanBuild(PlatformType platformType)
         {
-            if (_buildTabProxy.PerPlatformOptions.TryGetValue(platformType, out var platform))
+            if (_buildTabProxy != null && _buildTabProxy.PerPlatformOptions.TryGetValue(platformType, out var platform))
                 return platform.IsAvailable && platform.IsSupported;
             return false;
         }
diff --git a/Source/Engine/Core/Math/Quaternion.h b/Source/Engine/Core/Math/Quaternion.h
index cadc6730b..0b181f862 100644
--- a/Source/Engine/Core/Math/Quaternion.h
+++ b/Source/Engine/Core/Math/Quaternion.h
@@ -393,8 +393,8 @@ public:
     /// <returns>The inverse of the specified quaternion.</returns>
     static Quaternion Invert(const Quaternion& value)
     {
-        Quaternion result;
-        Invert(value, result);
+        Quaternion result = value;
+        result.Invert();
         return result;
     }
 
diff --git a/Source/Engine/Core/Math/Transform.h b/Source/Engine/Core/Math/Transform.h
index 8e9e07e0a..378e44ac0 100644
--- a/Source/Engine/Core/Math/Transform.h
+++ b/Source/Engine/Core/Math/Transform.h
@@ -155,7 +155,7 @@ public:
     /// Subtracts transformation from this transform.
     /// </summary>
     /// <param name="other">The other transformation.</param>
-    /// <returns>The different of two transformations.</returns>
+    /// <returns>The difference of two transformations.</returns>
     Transform Subtract(const Transform& other) const;
 
     /// <summary>