diff --git a/DisCatSharp.Experimental/AudioHelper.cs b/DisCatSharp.Experimental/AudioHelper.cs
index 780fc5e20..12295946f 100644
--- a/DisCatSharp.Experimental/AudioHelper.cs
+++ b/DisCatSharp.Experimental/AudioHelper.cs
@@ -84,12 +84,12 @@ public static (Stream Stream, byte[] Waveform) GenerateWaveformBytes(this Stream
 	/// </summary>
 	/// <param name="opusStream">The audio stream.</param>
 	/// <returns>The generated data.</returns>
-	public static (Stream Stream, float DurationSeconds, byte[] Waveform) GetDurationAndWaveformBytes(this Stream opusStream)
+	public static (float DurationSeconds, byte[] Waveform) GetDurationAndWaveformBytes(this Stream opusStream)
 	{
 		var (durationStream, duration) = GetOpusAudioDurationInSeconds(opusStream);
-		var (waveStream, waveform) = GenerateWaveformBytes(durationStream);
+		var (_, waveform) = GenerateWaveformBytes(durationStream);
 
-		return (waveStream, duration, waveform);
+		return (duration, waveform);
 	}
 
 	/// <summary>
diff --git a/DisCatSharp.Experimental/Entities/Message/DiscordMessageBuilderMethodHooks.cs b/DisCatSharp.Experimental/Entities/Message/DiscordMessageBuilderMethodHooks.cs
index a6147702b..c0c37897d 100644
--- a/DisCatSharp.Experimental/Entities/Message/DiscordMessageBuilderMethodHooks.cs
+++ b/DisCatSharp.Experimental/Entities/Message/DiscordMessageBuilderMethodHooks.cs
@@ -30,7 +30,7 @@ public static DiscordMessageBuilder AddGcpAttachment(this DiscordMessageBuilder
 		else
 		{
 			ArgumentNullException.ThrowIfNull(originalStream, nameof(originalStream));
-			var (_, durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
+			var (durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
 			Console.WriteLine($"Waveform length: {waveform.Length} bytes");
 			builder.AttachmentsInternal.Add(new()
 			{
@@ -66,7 +66,7 @@ public static DiscordInteractionResponseBuilder AddGcpAttachment(this DiscordInt
 		else
 		{
 			ArgumentNullException.ThrowIfNull(originalStream, nameof(originalStream));
-			var (_, durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
+			var (durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
 			Console.WriteLine($"Waveform length: {waveform.Length} bytes");
 			builder.AttachmentsInternal.Add(new()
 			{
@@ -102,7 +102,7 @@ public static DiscordWebhookBuilder AddGcpAttachment(this DiscordWebhookBuilder
 		else
 		{
 			ArgumentNullException.ThrowIfNull(originalStream, nameof(originalStream));
-			var (_, durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
+			var (durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
 			builder.AttachmentsInternal.Add(new()
 			{
 				Filename = gcpAttachment.Filename,
@@ -137,7 +137,7 @@ public static DiscordFollowupMessageBuilder AddGcpAttachment(this DiscordFollowu
 		else
 		{
 			ArgumentNullException.ThrowIfNull(originalStream, nameof(originalStream));
-			var (_, durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
+			var (durationSeconds, waveform) = originalStream.GetDurationAndWaveformBytes();
 			builder.AttachmentsInternal.Add(new()
 			{
 				Filename = gcpAttachment.Filename,
diff --git a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs b/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
index 23258d7ba..55ea145a2 100644
--- a/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
+++ b/DisCatSharp/Entities/Guild/DiscordGuild.AuditLog.cs
@@ -881,7 +881,7 @@ PropertyChange<DiscordChannel> GetChannelChange()
 				case AuditLogActionType.WebhookUpdate:
 					entry = new DiscordAuditLogWebhookEntry
 					{
-						Target = ahd.TryGetValue(xac.TargetId.Value, out var webhook)
+						Target = ahd?.TryGetValue(xac.TargetId.Value, out var webhook) ?? false
 							? webhook
 							: new()
 							{