diff --git a/src/Box2D.NET.Samples/Graphics/Draws.cs b/src/Box2D.NET.Samples/Graphics/Draws.cs
index d53c636..80c8b14 100644
--- a/src/Box2D.NET.Samples/Graphics/Draws.cs
+++ b/src/Box2D.NET.Samples/Graphics/Draws.cs
@@ -74,7 +74,7 @@ public static void DrawTransform(Draw draw, in B2Transform transform, float scal
         AddLine(ref draw.lines, p1, p2, B2HexColor.b2_colorGreen);
     }
 
-    public static void DrawBounds(Draw draw, B2AABB aabb, B2HexColor c)
+    public static void DrawBounds(Draw draw, in B2AABB aabb, B2HexColor c)
     {
         B2Vec2 p1 = aabb.lowerBound;
         B2Vec2 p2 = new B2Vec2(aabb.upperBound.X, aabb.lowerBound.Y);
diff --git a/src/Box2D.NET/B2BoardPhases.cs b/src/Box2D.NET/B2BoardPhases.cs
index 5f53a3b..d861973 100644
--- a/src/Box2D.NET/B2BoardPhases.cs
+++ b/src/Box2D.NET/B2BoardPhases.cs
@@ -130,7 +130,7 @@ public static void b2UnBufferMove(B2BroadPhase bp, int proxyKey)
             }
         }
 
-        public static int b2BroadPhase_CreateProxy(B2BroadPhase bp, B2BodyType proxyType, B2AABB aabb, ulong categoryBits, int shapeIndex, bool forcePairCreation)
+        public static int b2BroadPhase_CreateProxy(B2BroadPhase bp, B2BodyType proxyType, in B2AABB aabb, ulong categoryBits, int shapeIndex, bool forcePairCreation)
         {
             B2_ASSERT(0 <= proxyType && proxyType < B2BodyType.b2_bodyTypeCount);
             int proxyId = b2DynamicTree_CreateProxy(bp.trees[(int)proxyType], aabb, categoryBits, (ulong)shapeIndex);
@@ -155,7 +155,7 @@ public static void b2BroadPhase_DestroyProxy(B2BroadPhase bp, int proxyKey)
             b2DynamicTree_DestroyProxy(bp.trees[(int)proxyType], proxyId);
         }
 
-        public static void b2BroadPhase_MoveProxy(B2BroadPhase bp, int proxyKey, B2AABB aabb)
+        public static void b2BroadPhase_MoveProxy(B2BroadPhase bp, int proxyKey, in B2AABB aabb)
         {
             B2BodyType proxyType = B2_PROXY_TYPE(proxyKey);
             int proxyId = B2_PROXY_ID(proxyKey);
@@ -164,7 +164,7 @@ public static void b2BroadPhase_MoveProxy(B2BroadPhase bp, int proxyKey, B2AABB
             b2BufferMove(bp, proxyKey);
         }
 
-        public static void b2BroadPhase_EnlargeProxy(B2BroadPhase bp, int proxyKey, B2AABB aabb)
+        public static void b2BroadPhase_EnlargeProxy(B2BroadPhase bp, int proxyKey, in B2AABB aabb)
         {
             B2_ASSERT(proxyKey != B2_NULL_INDEX);
             B2BodyType typeIndex = B2_PROXY_TYPE(proxyKey);
diff --git a/src/Box2D.NET/B2WorldQueryContext.cs b/src/Box2D.NET/B2WorldQueryContext.cs
index 327c3a1..35458c9 100644
--- a/src/Box2D.NET/B2WorldQueryContext.cs
+++ b/src/Box2D.NET/B2WorldQueryContext.cs
@@ -11,7 +11,7 @@ public struct B2WorldQueryContext
         public B2QueryFilter filter;
         public object userContext;
 
-        public B2WorldQueryContext(B2World world, b2OverlapResultFcn fcn, B2QueryFilter filter, object userContext)
+        public B2WorldQueryContext(B2World world, b2OverlapResultFcn fcn, in B2QueryFilter filter, object userContext)
         {
             this.world = world;
             this.fcn = fcn;
diff --git a/src/Box2D.NET/B2Worlds.cs b/src/Box2D.NET/B2Worlds.cs
index 2b58a80..2445302 100644
--- a/src/Box2D.NET/B2Worlds.cs
+++ b/src/Box2D.NET/B2Worlds.cs
@@ -1832,7 +1832,7 @@ static bool TreeQueryCallback(int proxyId, ulong userData, ref B2WorldQueryConte
             return result;
         }
 
-        public static B2TreeStats b2World_OverlapAABB(B2WorldId worldId, B2AABB aabb, B2QueryFilter filter, b2OverlapResultFcn fcn, object context)
+        public static B2TreeStats b2World_OverlapAABB(B2WorldId worldId, in B2AABB aabb, in B2QueryFilter filter, b2OverlapResultFcn fcn, object context)
         {
             B2TreeStats treeStats = new B2TreeStats();