diff --git a/SabreTools.Library/FileTypes/SevenZipArchive.cs b/SabreTools.Library/FileTypes/SevenZipArchive.cs
index f7ee3bb1..bdddf6fa 100644
--- a/SabreTools.Library/FileTypes/SevenZipArchive.cs
+++ b/SabreTools.Library/FileTypes/SevenZipArchive.cs
@@ -396,7 +396,7 @@ namespace SabreTools.Library.FileTypes
 					};
 
 					// Create the temp directory
-					string tempPath = Path.Combine(Path.GetTempPath(), new Guid().ToString());
+					string tempPath = Path.Combine(outDir, new Guid().ToString());
 					if (!Directory.Exists(tempPath))
 					{
 						Directory.CreateDirectory(tempPath);
@@ -609,7 +609,7 @@ namespace SabreTools.Library.FileTypes
 					keys.Sort(ZipFile.TorrentZipStringCompare);
 
 					// Create the temp directory
-					string tempPath = Path.Combine(Path.GetTempPath(), new Guid().ToString());
+					string tempPath = Path.Combine(outDir, new Guid().ToString());
 					if (!Directory.Exists(tempPath))
 					{
 						Directory.CreateDirectory(tempPath);
diff --git a/SabreTools.Library/FileTypes/XZArchive.cs b/SabreTools.Library/FileTypes/XZArchive.cs
index cb2a982e..95e8b65b 100644
--- a/SabreTools.Library/FileTypes/XZArchive.cs
+++ b/SabreTools.Library/FileTypes/XZArchive.cs
@@ -194,7 +194,7 @@ namespace SabreTools.Library.FileTypes
 					};
 
 					// Create the temp directory
-					string tempPath = Path.Combine(Path.GetTempPath(), new Guid().ToString());
+					string tempPath = Path.Combine(outDir, new Guid().ToString());
 					if (!Directory.Exists(tempPath))
 					{
 						Directory.CreateDirectory(tempPath);
@@ -407,7 +407,7 @@ namespace SabreTools.Library.FileTypes
 					keys.Sort(ZipFile.TorrentZipStringCompare);
 
 					// Create the temp directory
-					string tempPath = Path.Combine(Path.GetTempPath(), new Guid().ToString());
+					string tempPath = Path.Combine(outDir, new Guid().ToString());
 					if (!Directory.Exists(tempPath))
 					{
 						Directory.CreateDirectory(tempPath);
diff --git a/SabreTools.Library/Tools/Utilities.cs b/SabreTools.Library/Tools/Utilities.cs
index 9c344a72..f9d5bfba 100644
--- a/SabreTools.Library/Tools/Utilities.cs
+++ b/SabreTools.Library/Tools/Utilities.cs
@@ -974,7 +974,6 @@ namespace SabreTools.Library.Tools
 		/// </summary>
 		/// <param name="filename">Name of the file to be parsed</param>
 		/// <returns>The DatFormat corresponding to the DAT</returns>
-		/// <remarks>There is currently no differentiation between XML and SabreDAT here</remarks>
 		public static DatFormat GetDatFormat(string filename)
 		{
 			// Limit the output formats based on extension