diff --git a/TwitchDownloaderCLI/Program.cs b/TwitchDownloaderCLI/Program.cs
index 93b810d7..f6e4aabe 100644
--- a/TwitchDownloaderCLI/Program.cs
+++ b/TwitchDownloaderCLI/Program.cs
@@ -21,7 +21,7 @@ private static void Main(string[] args)
             var parser = new Parser(config =>
             {
                 config.CaseInsensitiveEnumValues = true;
-                config.HelpWriter = TextWriter.Null;
+                config.HelpWriter = null; // Use null instead of TextWriter.Null due to how CommandLine works internally
             });
 
             var parserResult = parser.ParseArguments<VideoDownloadArgs, ClipDownloadArgs, ChatDownloadArgs, ChatUpdateArgs, ChatRenderArgs, FfmpegArgs, CacheArgs>(preParsedArgs);
diff --git a/TwitchDownloaderWPF/WindowMassDownload.xaml.cs b/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
index dfffdbe4..254f4820 100644
--- a/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
+++ b/TwitchDownloaderWPF/WindowMassDownload.xaml.cs
@@ -49,13 +49,13 @@ private async void btnChannel_Click(object sender, RoutedEventArgs e)
             await ChangeCurrentChannel();
         }
 
-        private async Task ChangeCurrentChannel()
+        private Task ChangeCurrentChannel()
         {
             currentChannel = textChannel.Text;
             videoList.Clear();
             cursorList.Clear();
             cursorIndex = -1;
-            await UpdateList();
+            return UpdateList();
         }
 
         private async Task UpdateList()