diff --git a/include/windivert_device.h b/include/windivert_device.h
index 1d8588d..d424b45 100644
--- a/include/windivert_device.h
+++ b/include/windivert_device.h
@@ -190,22 +190,24 @@
 /*
  * WinDivert filter flags.
  */
-#define WINDIVERT_FILTER_FLAG_INBOUND               0x0000000000000001ull
-#define WINDIVERT_FILTER_FLAG_OUTBOUND              0x0000000000000002ull
-#define WINDIVERT_FILTER_FLAG_IP                    0x0000000000000004ull
-#define WINDIVERT_FILTER_FLAG_IPV6                  0x0000000000000008ull
-#define WINDIVERT_FILTER_FLAG_EVENT_FLOW_DELETED    0x0000000000000010ull
-#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_BIND     0x0000000000000020ull
-#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_UNBIND   0x0000000000000040ull
-#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_CONNECT  0x0000000000000080ull
+#define WINDIVERT_FILTER_FLAG_INBOUND               0x0000000000000010ull
+#define WINDIVERT_FILTER_FLAG_OUTBOUND              0x0000000000000020ull
+#define WINDIVERT_FILTER_FLAG_IP                    0x0000000000000040ull
+#define WINDIVERT_FILTER_FLAG_IPV6                  0x0000000000000080ull
+#define WINDIVERT_FILTER_FLAG_EVENT_FLOW_DELETED    0x0000000000000100ull
+#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_BIND     0x0000000000000200ull
+#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_UNBIND   0x0000000000000400ull
+#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_CONNECT  0x0000000000000800ull
 #define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_DISCONNECT                       \
-                                                    0x0000000000000100ull
-#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_LISTEN   0x0000000000000200ull
-#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_ACCEPT   0x0000000000000800ull
+                                                    0x0000000000001000ull
+#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_LISTEN   0x0000000000002000ull
+#define WINDIVERT_FILTER_FLAG_EVENT_SOCKET_ACCEPT   0x0000000000004000ull
 
 #define WINDIVERT_FILTER_FLAGS_ALL                                          \
-    (WINDIVERT_FILTER_FLAG_INBOUND | WINDIVERT_FILTER_FLAG_OUTBOUND |       \
-        WINDIVERT_FILTER_FLAG_IP | WINDIVERT_FILTER_FLAG_IPV6 |             \
+    (WINDIVERT_FILTER_FLAG_INBOUND |                                        \
+        WINDIVERT_FILTER_FLAG_OUTBOUND |                                    \
+        WINDIVERT_FILTER_FLAG_IP |                                          \
+        WINDIVERT_FILTER_FLAG_IPV6 |                                        \
         WINDIVERT_FILTER_FLAG_EVENT_FLOW_DELETED |                          \
         WINDIVERT_FILTER_FLAG_EVENT_SOCKET_BIND |                           \
         WINDIVERT_FILTER_FLAG_EVENT_SOCKET_UNBIND |                         \
diff --git a/test/test.c b/test/test.c
index 6388765..ee3f195 100644
--- a/test/test.c
+++ b/test/test.c
@@ -1091,8 +1091,8 @@ static BOOL run_test(HANDLE inject_handle, const char *filter,
     addr_send.IPChecksum  = FALSE;
     addr_send.TCPChecksum = FALSE;
     addr_send.UDPChecksum = FALSE;
-    if (!WinDivertSend(inject_handle, (PVOID)packet, packet_len, &addr_send,
-            NULL))
+    if (!WinDivertSend(inject_handle, (PVOID)packet, packet_len, NULL,
+            &addr_send))
     {
         fprintf(stderr, "error: failed to inject test packet (err = %d)\n",
             GetLastError());
@@ -1261,7 +1261,7 @@ static DWORD monitor_worker(LPVOID arg)
         // (1) Read the reflected filter:
         WinDivertHelperCompileFilter(tests[i].filter, WINDIVERT_LAYER_NETWORK,
             object_1, sizeof(object_1), NULL, NULL);
-        if (!WinDivertRecv(handle, packet, sizeof(packet), &addr, &packet_len))
+        if (!WinDivertRecv(handle, packet, sizeof(packet), &packet_len, &addr))
         {
             fprintf(stderr, "error: failed to read OPEN event (err = %d)\n",
                 GetLastError());