diff --git a/src/GUI/Shared/Extensions/ProjectExtensions.cs b/src/GUI/Shared/Extensions/ProjectExtensions.cs
index 419230088..c15c78a9b 100644
--- a/src/GUI/Shared/Extensions/ProjectExtensions.cs
+++ b/src/GUI/Shared/Extensions/ProjectExtensions.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading.Tasks;
 using Community.VisualStudio.Toolkit;
 using EFCorePowerTools.Handlers.ReverseEngineer;
@@ -266,7 +267,7 @@ public static async Task<bool> IsInstalledAsync(this Project project, NuGetPacka
             return false;
         }
 
-        public static List<string> GenerateFiles(this Project project, List<Tuple<string, string>> result, string extension)
+        public static List<string> GenerateFiles(this Project project, List<Tuple<string, string>> result, string extension, bool addToProject = false)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
@@ -281,19 +282,28 @@ public static List<string> GenerateFiles(this Project project, List<Tuple<string
                     return list;
                 }
 
-                var filePath = Path.Combine(
-                    Path.GetTempPath(),
-                    item.Item1 + extension);
-
-                if (File.Exists(filePath))
+                if (addToProject)
                 {
-                    File.SetAttributes(filePath, FileAttributes.Normal);
+                    var itemPath = Path.Combine(Path.GetDirectoryName(project.FullPath), item.Item1 + extension);
+                    File.WriteAllText(itemPath, item.Item2, Encoding.UTF8);
+                    list.Add(itemPath);
                 }
+                else
+                {
+                    var filePath = Path.Combine(
+                        Path.GetTempPath(),
+                        item.Item1 + extension);
+
+                    if (File.Exists(filePath))
+                    {
+                        File.SetAttributes(filePath, FileAttributes.Normal);
+                    }
 
-                File.WriteAllText(filePath, item.Item2);
-                File.SetAttributes(filePath, FileAttributes.ReadOnly);
+                    File.WriteAllText(filePath, item.Item2, Encoding.UTF8);
+                    File.SetAttributes(filePath, FileAttributes.ReadOnly);
 
-                list.Add(filePath);
+                    list.Add(filePath);
+                }
             }
 
             return list;
diff --git a/src/GUI/Shared/Handlers/ModelAnalyzerHandler.cs b/src/GUI/Shared/Handlers/ModelAnalyzerHandler.cs
index cc55533b3..6d24741cc 100644
--- a/src/GUI/Shared/Handlers/ModelAnalyzerHandler.cs
+++ b/src/GUI/Shared/Handlers/ModelAnalyzerHandler.cs
@@ -92,7 +92,7 @@ public async System.Threading.Tasks.Task GenerateAsync(string outputPath, Projec
                         Telemetry.TrackEvent("PowerTools.GenerateModelDgml");
                         break;
                     case GenerationType.Ddl:
-                        var files = project.GenerateFiles(modelResult, ".sql");
+                        var files = project.GenerateFiles(modelResult, ".sql", addToProject: true);
                         foreach (var file in files)
                         {
                             await VS.Documents.OpenAsync(file);
diff --git a/src/GUI/Shared/Handlers/ProcessLauncher.cs b/src/GUI/Shared/Handlers/ProcessLauncher.cs
index 41f994d7f..74832a472 100644
--- a/src/GUI/Shared/Handlers/ProcessLauncher.cs
+++ b/src/GUI/Shared/Handlers/ProcessLauncher.cs
@@ -227,7 +227,7 @@ private async Task<string> GetOutputInternalAsync(string outputPath, string proj
 
             try
             {
-                File.WriteAllText(Path.Combine(Path.GetTempPath(), "efptparams.txt"), startInfo.Arguments);
+                File.WriteAllText(Path.Combine(Path.GetTempPath(), "efptparams.txt"), startInfo.Arguments, Encoding.UTF8);
             }
             catch
             {
diff --git a/src/GUI/Shared/Handlers/ReverseEngineer/EfRevEngLauncher.cs b/src/GUI/Shared/Handlers/ReverseEngineer/EfRevEngLauncher.cs
index 5bd88b710..a097b545b 100644
--- a/src/GUI/Shared/Handlers/ReverseEngineer/EfRevEngLauncher.cs
+++ b/src/GUI/Shared/Handlers/ReverseEngineer/EfRevEngLauncher.cs
@@ -5,6 +5,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Threading.Tasks;
 using EFCorePowerTools.Extensions;
 using RevEng.Common;
@@ -195,7 +196,7 @@ private async Task<ProcessStartInfo> CreateStartInfoAsync(string arguments)
         private async Task<ReverseEngineerResult> GetOutputAsync()
         {
             var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()) + ".json";
-            File.WriteAllText(path, options.Write());
+            File.WriteAllText(path, options.Write(), Encoding.UTF8);
 
             var launchPath = DropNetCoreFiles();