diff --git a/DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs b/DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
index a4cd1bc4..2088e8d1 100644
--- a/DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
+++ b/DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs
@@ -36,17 +36,19 @@ public class GetChannelsCommand : DiscordCommandBase
             .ThenBy(c => c.Name)
             .ToArray();
 
-        var threads = IncludeThreads
-            ? (await Discord.GetGuildThreadsAsync(GuildId, cancellationToken))
-            .OrderBy(c => c.Name)
-            .ToArray()
-            : Array.Empty<ChannelThread>();
+        var threads = Array.Empty<ChannelThread>();
+        if (IncludeThreads)
+        {
+            threads = (await Discord.GetGuildThreadsAsync(GuildId, cancellationToken))
+                .OrderBy(c => c.Name)
+                .ToArray();
+        }
 
         foreach (var channel in channels)
         {
             // Channel ID
             await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(18, ' ')
+                channel.Id.ToString().PadRight(20, ' ')
             );
 
             // Separator
@@ -64,7 +66,7 @@ public class GetChannelsCommand : DiscordCommandBase
 
                 // Thread ID
                 await console.Output.WriteAsync(
-                    thread.Id.ToString().PadRight(18, ' ')
+                    thread.Id.ToString().PadRight(20, ' ')
                 );
 
                 // Separator
diff --git a/DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs b/DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs
index 5271de78..d4a999a5 100644
--- a/DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs
+++ b/DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs
@@ -26,7 +26,7 @@ public class GetDirectChannelsCommand : DiscordCommandBase
         {
             // Channel ID
             await console.Output.WriteAsync(
-                channel.Id.ToString().PadRight(18, ' ')
+                channel.Id.ToString().PadRight(20, ' ')
             );
 
             // Separator
diff --git a/DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs b/DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs
index e5efe3e4..d3a174d1 100644
--- a/DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs
+++ b/DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs
@@ -19,13 +19,14 @@ public class GetGuildsCommand : DiscordCommandBase
         var guilds = (await Discord.GetUserGuildsAsync(cancellationToken))
             // Show direct messages first
             .OrderByDescending(g => g.Id == Guild.DirectMessages.Id)
-            .ThenBy(g => g.Name);
+            .ThenBy(g => g.Name)
+            .ToArray();
 
         foreach (var guild in guilds)
         {
             // Guild ID
             await console.Output.WriteAsync(
-                guild.Id.ToString().PadRight(18, ' ')
+                guild.Id.ToString().PadRight(20, ' ')
             );
 
             // Separator