diff --git a/ComputeUniforms/ComputeUniformsGame.cs b/ComputeUniforms/ComputeUniformsGame.cs
index c54f2cf..87ecbae 100644
--- a/ComputeUniforms/ComputeUniformsGame.cs
+++ b/ComputeUniforms/ComputeUniformsGame.cs
@@ -100,8 +100,8 @@ namespace MoonWorks.Test
 
             cmdbuf.BindComputePipeline(gradientTextureComputePipeline);
             cmdbuf.BindComputeTextures(texture);
-            cmdbuf.PushComputeShaderUniforms(gradientUniforms);
-            cmdbuf.DispatchCompute(gradientUniforms.groupCountX, gradientUniforms.groupCountY, 1, 0);
+            uint offset = cmdbuf.PushComputeShaderUniforms(gradientUniforms);
+            cmdbuf.DispatchCompute(gradientUniforms.groupCountX, gradientUniforms.groupCountY, 1, offset);
 
             GraphicsDevice.Submit(cmdbuf);
             GraphicsDevice.Wait();
diff --git a/DrawIndirect/DrawIndirectGame.cs b/DrawIndirect/DrawIndirectGame.cs
index aaa6fbf..d0a62b1 100644
--- a/DrawIndirect/DrawIndirectGame.cs
+++ b/DrawIndirect/DrawIndirectGame.cs
@@ -32,7 +32,7 @@ namespace MoonWorks.Test
 
             // Create and populate the vertex buffer
             vertexBuffer = Buffer.Create<PositionColorVertex>(GraphicsDevice, BufferUsageFlags.Vertex, 6);
-            drawBuffer = Buffer.Create<DrawIndirectCommand>(GraphicsDevice, BufferUsageFlags.Indirect, 2);
+            drawBuffer = Buffer.Create<IndirectDrawCommand>(GraphicsDevice, BufferUsageFlags.Indirect, 2);
 
             CommandBuffer cmdbuf = GraphicsDevice.AcquireCommandBuffer();
             cmdbuf.SetBufferData(
@@ -50,10 +50,10 @@ namespace MoonWorks.Test
             );
             cmdbuf.SetBufferData(
                 drawBuffer,
-                new DrawIndirectCommand[]
+                new IndirectDrawCommand[]
                 {
-                    new DrawIndirectCommand(3, 1, 3, 0),
-                    new DrawIndirectCommand(3, 1, 0, 0),
+                    new IndirectDrawCommand(3, 1, 3, 0),
+                    new IndirectDrawCommand(3, 1, 0, 0),
                 }
             );
             GraphicsDevice.Submit(cmdbuf);
@@ -71,7 +71,7 @@ namespace MoonWorks.Test
                 cmdbuf.BeginRenderPass(new ColorAttachmentInfo(backbuffer, Color.CornflowerBlue));
                 cmdbuf.BindGraphicsPipeline(graphicsPipeline);
                 cmdbuf.BindVertexBuffers(new BufferBinding(vertexBuffer, 0));
-                cmdbuf.DrawPrimitivesIndirect(drawBuffer, 0, 2, (uint) Marshal.SizeOf<DrawIndirectCommand>(), 0, 0);
+                cmdbuf.DrawPrimitivesIndirect(drawBuffer, 0, 2, (uint) Marshal.SizeOf<IndirectDrawCommand>(), 0, 0);
                 cmdbuf.EndRenderPass();
             }
             GraphicsDevice.Submit(cmdbuf);