diff --git a/DATabase/Core/Generate.cs b/DATabase/Core/Generate.cs
index af84bff0..0517c89a 100644
--- a/DATabase/Core/Generate.cs
+++ b/DATabase/Core/Generate.cs
@@ -50,9 +50,15 @@ namespace SabreTools
 			// Take care of special outfolder cases
 			_outdir = (outdir == "" ? outdir :
 				(outdir.Contains("/") && !outdir.EndsWith("/") ? outdir + "/" :
-					(outdir.Contains("\\") && !outdir.EndsWith("\\") ? outdir + "\\" : outdir)
+					(outdir.Contains("\\") && !outdir.EndsWith("\\") ? outdir + "\\" :
+						(!outdir.Contains("/") && !outdir.Contains("\\") ? outdir + "\\" : outdir)
+					)
 				)
 			);
+			if (!Directory.Exists(_outdir))
+			{
+				Directory.CreateDirectory(_outdir);
+			}
 
 			_headers = new Dictionary<int, string>();
 			_headers.Add(25, "a7800.xml");
@@ -74,7 +80,7 @@ namespace SabreTools
 			int id = 0;
 			if (_sources != "" && Int32.TryParse(_sources, out id) && id <= 14)
             {
-				_logger.Log("This source (" + id + ") is import-only so a DAT cannot be created. We apologize for the inconvenience.");
+				_logger.Warning("This source (" + id + ") is import-only so a DAT cannot be created. We apologize for the inconvenience.");
 				return false;
 			}
 
diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs
index 7056b47b..7c234eaf 100644
--- a/DATabase/DATabase.cs
+++ b/DATabase/DATabase.cs
@@ -472,7 +472,7 @@ Make a selection:
 
     1) " + (norename ? "Enable game renaming" : "Disable game renaming") + @"
     2) " + (old ? "Enable XML output" : "Enable RomVault output") + @"
-	3) Enter an output folder
+    3) Enter an output folder
     4) Generate all DAT files
     B) Go back to the previous menu
 ");