diff --git a/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs b/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
index fbe197651e..7111196b79 100644
--- a/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
+++ b/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs
@@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.Shader.Translation
                     {
                         if (target.ComponentEnabled(component))
                         {
-                            Operand dest = Attribute(AttributeConsts.FragmentOutputColorBase + regIndex * 4);
+                            Operand dest = Attribute(AttributeConsts.FragmentOutputColorBase + attachment * 16 + component * 4);
 
                             Operand src = Register(regIndex, RegisterType.Gpr);
 
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
index 379cf2dfb0..b2a07e475d 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/IAudioRenderer.cs
@@ -346,7 +346,6 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
 
                 int   outOffset      = 0;
                 int   pendingSamples = MixBufferSamplesCount;
-                float volume         = voice.Volume;
 
                 while (pendingSamples > 0)
                 {
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
index 1c5b2903ff..f4a77f2f92 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/Types/UpdateDataHeader.cs
@@ -8,7 +8,7 @@
         public int VoiceSize;
         public int VoiceResourceSize;
         public int EffectSize;
-        public int MixeSize;
+        public int MixSize;
         public int SinkSize;
         public int PerformanceManagerSize;
         public int Unknown24;
diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
index 60fe2e2342..4af04ee008 100644
--- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
+++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManager/VoiceContext.cs
@@ -108,7 +108,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRendererManager
 
                 if (wb.Looping == 0)
                 {
-                    SetBufferIndex((_bufferIndex + 1) & 3);
+                    SetBufferIndex(_bufferIndex + 1);
                 }
 
                 _outStatus.PlayedWaveBuffersCount++;