diff --git a/Source/AaxDecrypter/AaxDecrypter.csproj b/Source/AaxDecrypter/AaxDecrypter.csproj
index 7a885fb2..5724667b 100644
--- a/Source/AaxDecrypter/AaxDecrypter.csproj
+++ b/Source/AaxDecrypter/AaxDecrypter.csproj
@@ -13,7 +13,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="AAXClean.Codecs" Version="0.2.14" />
+	  <PackageReference Include="AAXClean.Codecs" Version="0.2.15" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Source/AaxDecrypter/AaxcDownloadConvertBase.cs b/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
index 10f2cc37..dc4eeb66 100644
--- a/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
+++ b/Source/AaxDecrypter/AaxcDownloadConvertBase.cs
@@ -32,6 +32,9 @@ namespace AaxDecrypter
 				AaxFile.AppleTags.Album = AaxFile.AppleTags.Album?.Replace(" (Unabridged)", "");
 			}
 
+			if (DownloadOptions.FixupFile)
+				AaxFile.AppleTags.AppleListBox.EditOrAddTag("TCOM", AaxFile.AppleTags.Narrator);
+
 			//Finishing configuring lame encoder.
 			if (DownloadOptions.OutputFormat == OutputFormat.Mp3)
 				MpegUtil.ConfigureLameOptions(
diff --git a/Source/LibationAvalonia/Views/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
index 6d4e5a86..d8580470 100644
--- a/Source/LibationAvalonia/Views/MainWindow.axaml.cs
+++ b/Source/LibationAvalonia/Views/MainWindow.axaml.cs
@@ -77,7 +77,7 @@ namespace LibationAvalonia.Views
 
 			try
 			{
-				(string zipFile, UpgradeProperties upgradeProperties) = await Task.Run(() => downloadUpdate());
+				(string zipFile, UpgradeProperties upgradeProperties) = await Task.Run(downloadUpdate);
 
 				if (string.IsNullOrEmpty(zipFile) || !System.IO.File.Exists(zipFile))
 					return;
@@ -152,8 +152,6 @@ namespace LibationAvalonia.Views
 			var thisExe = Environment.ProcessPath;
 			var thisDir = System.IO.Path.GetDirectoryName(thisExe);
 
-			var args = $"--input {zipFile.SurroundWithQuotes()} --output {thisDir.SurroundWithQuotes()} --executable {thisExe.SurroundWithQuotes()}";
-
 			var zipExtractor = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "ZipExtractor.exe");
 
 			System.IO.File.Copy("ZipExtractor.exe", zipExtractor, overwrite: true);
@@ -164,8 +162,16 @@ namespace LibationAvalonia.Views
 				UseShellExecute = true,
 				Verb = "runas",
 				WindowStyle = System.Diagnostics.ProcessWindowStyle.Normal,
-				Arguments = args,
-				CreateNoWindow = true
+				CreateNoWindow = true,
+				ArgumentList =
+				{
+					"--input",
+					zipFile,
+					"--output",
+					thisDir,
+					"--executable",
+					thisExe
+				}
 			};
 
 			System.Diagnostics.Process.Start(psi);