diff --git a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
index 1edc426e003..233aab45b3f 100644
--- a/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
+++ b/modules/mono/editor/GodotTools/GodotTools.ProjectEditor/ProjectUtils.cs
@@ -85,7 +85,7 @@ namespace GodotTools.ProjectEditor
             void AddPropertyIfNotPresent(string name, string condition, string value)
             {
                 if (root.PropertyGroups
-                    .Any(g => g.Condition == string.Empty || g.Condition == condition &&
+                    .Any(g => (g.Condition == string.Empty || g.Condition == condition) &&
                               g.Properties
                                   .Any(p => p.Name == name &&
                                             p.Value == value &&
diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpBuilds.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpBuilds.cs
index a884b0ead0e..7d767260e34 100644
--- a/modules/mono/editor/GodotTools/GodotTools/GodotSharpBuilds.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/GodotSharpBuilds.cs
@@ -64,7 +64,7 @@ namespace GodotTools
 
         private static string GetIssuesFilePath(MonoBuildInfo buildInfo)
         {
-            return Path.Combine(Godot.ProjectSettings.LocalizePath(buildInfo.LogsDirPath), MsBuildIssuesFileName);
+            return Path.Combine(buildInfo.LogsDirPath, MsBuildIssuesFileName);
         }
 
         private static void PrintVerbose(string text)
diff --git a/modules/mono/editor/GodotTools/GodotTools/MonoBuildTab.cs b/modules/mono/editor/GodotTools/GodotTools/MonoBuildTab.cs
index 75fdacc0da7..3a74fa2f66a 100644
--- a/modules/mono/editor/GodotTools/GodotTools/MonoBuildTab.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/MonoBuildTab.cs
@@ -61,41 +61,48 @@ namespace GodotTools
         {
             using (var file = new Godot.File())
             {
-                Error openError = file.Open(csvFile, Godot.File.ModeFlags.Read);
-
-                if (openError != Error.Ok)
-                    return;
-
-                while (!file.EofReached())
+                try
                 {
-                    string[] csvColumns = file.GetCsvLine();
+                    Error openError = file.Open(csvFile, Godot.File.ModeFlags.Read);
 
-                    if (csvColumns.Length == 1 && csvColumns[0].Empty())
+                    if (openError != Error.Ok)
                         return;
 
-                    if (csvColumns.Length != 7)
+                    while (!file.EofReached())
                     {
-                        GD.PushError($"Expected 7 columns, got {csvColumns.Length}");
-                        continue;
+                        string[] csvColumns = file.GetCsvLine();
+
+                        if (csvColumns.Length == 1 && csvColumns[0].Empty())
+                            return;
+
+                        if (csvColumns.Length != 7)
+                        {
+                            GD.PushError($"Expected 7 columns, got {csvColumns.Length}");
+                            continue;
+                        }
+
+                        var issue = new BuildIssue
+                        {
+                            Warning = csvColumns[0] == "warning",
+                            File = csvColumns[1],
+                            Line = int.Parse(csvColumns[2]),
+                            Column = int.Parse(csvColumns[3]),
+                            Code = csvColumns[4],
+                            Message = csvColumns[5],
+                            ProjectFile = csvColumns[6]
+                        };
+
+                        if (issue.Warning)
+                            WarningCount += 1;
+                        else
+                            ErrorCount += 1;
+
+                        issues.Add(issue);
                     }
-
-                    var issue = new BuildIssue
-                    {
-                        Warning = csvColumns[0] == "warning",
-                        File = csvColumns[1],
-                        Line = int.Parse(csvColumns[2]),
-                        Column = int.Parse(csvColumns[3]),
-                        Code = csvColumns[4],
-                        Message = csvColumns[5],
-                        ProjectFile = csvColumns[6]
-                    };
-
-                    if (issue.Warning)
-                        WarningCount += 1;
-                    else
-                        ErrorCount += 1;
-
-                    issues.Add(issue);
+                }
+                finally
+                {
+                    file.Close(); // Disposing it is not enough. We need to call Close()
                 }
             }
         }