diff --git a/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap
index a4f7c27f..54347403 100644
--- a/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-198132
\ No newline at end of file
+198780
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap
index 5a9bc93c..038dfe2d 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-229797
\ No newline at end of file
+231116
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap
index 689ecd8a..04587131 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-243298
\ No newline at end of file
+244626
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
index 1deec62d..3f03abfb 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-300708
\ No newline at end of file
+302041
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap
index 00eab807..9e863299 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-223323
\ No newline at end of file
+224642
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap
index 5f3411e0..f90f0f91 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-164517
\ No newline at end of file
+165165
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap
index 76a79751..9b6d35ad 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-150079
\ No newline at end of file
+150727
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap
index 3b1435ad..692864e4 100644
--- a/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-173829
\ No newline at end of file
+174481
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap b/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap
index f497df92..5abcbe4d 100644
--- a/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-RevertInvalidNonce.snap
@@ -1 +1 @@
-43133
\ No newline at end of file
+43785
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap b/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap
index 0383dc25..2b02fc3b 100644
--- a/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-V3-ExclusiveFiller.snap
@@ -1 +1 @@
-168443
\ No newline at end of file
+169089
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap b/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap
index 824d4c13..2d97ac44 100644
--- a/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-V3-InputOverride.snap
@@ -1 +1 @@
-168524
\ No newline at end of file
+169170
\ No newline at end of file
diff --git a/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap b/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap
index c11c0243..b4dc2dd4 100644
--- a/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap
+++ b/.forge-snapshots/Base-V3DutchOrder-V3-OutputOverride.snap
@@ -1 +1 @@
-168467
\ No newline at end of file
+169113
\ No newline at end of file
diff --git a/.forge-snapshots/V3-DutchDecay.snap b/.forge-snapshots/V3-DutchDecay.snap
index f7ed1714..2b163bad 100644
--- a/.forge-snapshots/V3-DutchDecay.snap
+++ b/.forge-snapshots/V3-DutchDecay.snap
@@ -1 +1 @@
-20920
\ No newline at end of file
+13179
\ No newline at end of file
diff --git a/.forge-snapshots/V3-DutchDecayBounded.snap b/.forge-snapshots/V3-DutchDecayBounded.snap
index 7862d759..1f168c59 100644
--- a/.forge-snapshots/V3-DutchDecayBounded.snap
+++ b/.forge-snapshots/V3-DutchDecayBounded.snap
@@ -1 +1 @@
-1209
\ No newline at end of file
+1199
\ No newline at end of file
diff --git a/.forge-snapshots/V3-DutchDecayFullyDecayed.snap b/.forge-snapshots/V3-DutchDecayFullyDecayed.snap
index d20b1a84..e5e37b03 100644
--- a/.forge-snapshots/V3-DutchDecayFullyDecayed.snap
+++ b/.forge-snapshots/V3-DutchDecayFullyDecayed.snap
@@ -1 +1 @@
-11797
\ No newline at end of file
+6677
\ No newline at end of file
diff --git a/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap b/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap
index fd311904..50d06af6 100644
--- a/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap
+++ b/.forge-snapshots/V3-DutchDecayFullyDecayedNegative.snap
@@ -1 +1 @@
-11485
\ No newline at end of file
+6365
\ No newline at end of file
diff --git a/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap b/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap
index 2fff3d5a..c1250b2e 100644
--- a/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap
+++ b/.forge-snapshots/V3-ExtendedMultiPointDutchDecay.snap
@@ -1 +1 @@
-209206
\ No newline at end of file
+88354
\ No newline at end of file
diff --git a/.forge-snapshots/V3-LocateCurvePositionMulti.snap b/.forge-snapshots/V3-LocateCurvePositionMulti.snap
index 1f9b6835..73b08ba1 100644
--- a/.forge-snapshots/V3-LocateCurvePositionMulti.snap
+++ b/.forge-snapshots/V3-LocateCurvePositionMulti.snap
@@ -1 +1 @@
-40525
\ No newline at end of file
+20492
\ No newline at end of file
diff --git a/.forge-snapshots/V3-LocateCurvePositionSingle.snap b/.forge-snapshots/V3-LocateCurvePositionSingle.snap
index e274bed6..9726dc60 100644
--- a/.forge-snapshots/V3-LocateCurvePositionSingle.snap
+++ b/.forge-snapshots/V3-LocateCurvePositionSingle.snap
@@ -1 +1 @@
-12623
\ No newline at end of file
+6860
\ No newline at end of file
diff --git a/.forge-snapshots/V3-MultiPointDutchDecay.snap b/.forge-snapshots/V3-MultiPointDutchDecay.snap
index 9015ad25..81237bad 100644
--- a/.forge-snapshots/V3-MultiPointDutchDecay.snap
+++ b/.forge-snapshots/V3-MultiPointDutchDecay.snap
@@ -1 +1 @@
-48878
\ No newline at end of file
+26242
\ No newline at end of file
diff --git a/src/lib/V3DutchOrderLib.sol b/src/lib/V3DutchOrderLib.sol
index 71174146..316aba09 100644
--- a/src/lib/V3DutchOrderLib.sol
+++ b/src/lib/V3DutchOrderLib.sol
@@ -110,8 +110,13 @@ library V3DutchOrderLib {
         abi.encodePacked("NonlinearDutchDecay(", "uint256 relativeBlocks,", "int256[] relativeAmounts)");
     bytes32 internal constant NON_LINEAR_DECAY_TYPE_HASH = keccak256(NON_LINEAR_DECAY_TYPE);
 
-    bytes internal constant ORDER_TYPE =
-        abi.encodePacked(NON_LINEAR_DECAY_TYPE, V3_DUTCH_ORDER_TYPE, V3_DUTCH_OUTPUT_TYPE, OrderInfoLib.ORDER_INFO_TYPE);
+    bytes internal constant ORDER_TYPE = abi.encodePacked(
+        NON_LINEAR_DECAY_TYPE,
+        V3_DUTCH_INPUT_TYPE,
+        V3_DUTCH_ORDER_TYPE,
+        V3_DUTCH_OUTPUT_TYPE,
+        OrderInfoLib.ORDER_INFO_TYPE
+    );
     bytes32 internal constant ORDER_TYPE_HASH = keccak256(ORDER_TYPE);
 
     /// @dev Note that sub-structs have to be defined in alphabetical order in the EIP-712 spec
diff --git a/src/types/Uint16Array.sol b/src/types/Uint16Array.sol
index a940d33a..0ecb75a7 100644
--- a/src/types/Uint16Array.sol
+++ b/src/types/Uint16Array.sol
@@ -31,7 +31,7 @@ function toUint16Array(uint16[] memory inputArray) pure returns (Uint16Array uin
 
 library Uint16ArrayLibrary {
     // Retrieve the nth uint16 value from a packed uint256
-    function getElement(Uint16Array packedData, uint256 n) public pure returns (uint16) {
+    function getElement(Uint16Array packedData, uint256 n) internal pure returns (uint16) {
         if (n >= 16) {
             revert IndexOutOfBounds();
         }