diff --git a/Solver/Intrinsics.cs b/Solver/Intrinsics.cs
index d901f7f..6eca3b9 100644
--- a/Solver/Intrinsics.cs
+++ b/Solver/Intrinsics.cs
@@ -34,13 +34,22 @@ internal static class Intrinsics
         return m;
     }
 
+    [Pure]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static Vector256<float> ClearLastN(Vector256<float> data, int len)
+    {
+        var threshold = Vector256.Create<int>(len);
+        var index = Vector256.Create(0, 1, 2, 3, 4, 5, 6, 7);
+        return Avx.And(Avx2.CompareGreaterThan(threshold, index).AsSingle(), data);
+    }
+
     [Pure]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     // https://stackoverflow.com/a/23592221
     private static int HMaxIndexAVX2(Vector<float> v, int len)
     {
         // Remove NaNs
-        var vfilt = Avx.Blend(v.AsVector256(), Vector256<float>.Zero, (byte)~((1 << len) - 1));
+        var vfilt = ClearLastN(v.AsVector256(), len);
 
         // Find max value and broadcast to all lanes
         var vmax128 = HMax(vfilt);
@@ -50,7 +59,7 @@ internal static class Intrinsics
         var vcmp = Avx.CompareEqual(vfilt, vmax);
         var mask = unchecked((uint)Avx2.MoveMask(vcmp.AsByte()));
 
-        var inverseIdx = BitOperations.LeadingZeroCount(mask << (8 - len << 2)) >> 2;
+        var inverseIdx = BitOperations.LeadingZeroCount(mask << ((8 - len) << 2)) >> 2;
 
         return len - 1 - inverseIdx;
     }
@@ -158,6 +167,7 @@ internal static class Intrinsics
 
     [Pure]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    [SkipLocalsInit]
     public static Vector<float> ReciprocalSqrt(Vector<float> data)
     {
         if (Avx.IsSupported && Vector<float>.Count >= Vector256<float>.Count)