diff --git a/src/Ryujinx.Graphics.Metal/CommandBufferPool.cs b/src/Ryujinx.Graphics.Metal/CommandBufferPool.cs
index 050f93efcb..5e7576b37b 100644
--- a/src/Ryujinx.Graphics.Metal/CommandBufferPool.cs
+++ b/src/Ryujinx.Graphics.Metal/CommandBufferPool.cs
@@ -35,7 +35,12 @@ namespace Ryujinx.Graphics.Metal
 
             public void Use(MTLCommandQueue queue, IEncoderFactory stateManager)
             {
-                CommandBuffer = queue.CommandBuffer();
+                MTLCommandBufferDescriptor descriptor = new();
+#if DEBUG
+                descriptor.ErrorOptions = MTLCommandBufferErrorOption.EncoderExecutionStatus;
+#endif
+
+                CommandBuffer = queue.CommandBuffer(descriptor);
                 Fence = new FenceHolder(CommandBuffer);
 
                 Encoders.Initialize(CommandBuffer, stateManager);
diff --git a/src/Ryujinx.Graphics.Metal/EnumConversion.cs b/src/Ryujinx.Graphics.Metal/EnumConversion.cs
index 18662e21a8..091de7ef8e 100644
--- a/src/Ryujinx.Graphics.Metal/EnumConversion.cs
+++ b/src/Ryujinx.Graphics.Metal/EnumConversion.cs
@@ -137,7 +137,6 @@ namespace Ryujinx.Graphics.Metal
             };
         }
 
-        // TODO: Metal does not have native support for Triangle Fans but it is possible to emulate with TriangleStrip and moving around the indices
         public static MTLPrimitiveType Convert(this PrimitiveTopology topology)
         {
             return topology switch
diff --git a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs
index 3c9859a2f5..346beb02e2 100644
--- a/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs
+++ b/src/Ryujinx.Graphics.Shader/CodeGen/Msl/Declarations.cs
@@ -59,6 +59,9 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Msl
 
         public static void Declare(CodeGenContext context, StructuredProgramInfo info)
         {
+            // TODO: Re-enable this warning
+            context.AppendLine("#pragma clang diagnostic ignored \"-Wunused-variable\"");
+            context.AppendLine();
             context.AppendLine("#include <metal_stdlib>");
             context.AppendLine("#include <simd/simd.h>");
             context.AppendLine();