diff --git a/other/event_tooling/generate_event_c.cpp b/other/event_tooling/generate_event_c.cpp
index c332248..92b0106 100644
--- a/other/event_tooling/generate_event_c.cpp
+++ b/other/event_tooling/generate_event_c.cpp
@@ -306,7 +306,7 @@ void generate_event_impl(const std::string& event_name, std::vector<EventType> e
     f << "    Tox_Event_" << event_name << " *event, Bin_Unpack *bu)\n{\n";
     f << "    assert(event != nullptr);\n";
     if (event_types.size() > 1) {
-        f << "    if (!bin_unpack_array_fixed(bu, " << event_types.size() << ")) {\n        return false;\n    }\n\n";
+        f << "    if (!bin_unpack_array_fixed(bu, " << event_types.size() << ", nullptr)) {\n        return false;\n    }\n\n";
     }
 
     bool first = true;
diff --git a/toxcore/events/group_custom_packet.c b/toxcore/events/group_custom_packet.c
index 395c4ee..8bfc819 100644
--- a/toxcore/events/group_custom_packet.c
+++ b/toxcore/events/group_custom_packet.c
@@ -120,7 +120,7 @@ static bool tox_event_group_custom_packet_unpack(
     Tox_Event_Group_Custom_Packet *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_custom_private_packet.c b/toxcore/events/group_custom_private_packet.c
index bbae865..2d75259 100644
--- a/toxcore/events/group_custom_private_packet.c
+++ b/toxcore/events/group_custom_private_packet.c
@@ -120,7 +120,7 @@ static bool tox_event_group_custom_private_packet_unpack(
     Tox_Event_Group_Custom_Private_Packet *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_invite.c b/toxcore/events/group_invite.c
index dddc1f4..8522bb9 100644
--- a/toxcore/events/group_invite.c
+++ b/toxcore/events/group_invite.c
@@ -142,7 +142,7 @@ static bool tox_event_group_invite_unpack(
     Tox_Event_Group_Invite *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_join_fail.c b/toxcore/events/group_join_fail.c
index c6c2853..347fa12 100644
--- a/toxcore/events/group_join_fail.c
+++ b/toxcore/events/group_join_fail.c
@@ -84,7 +84,7 @@ static bool tox_event_group_join_fail_unpack(
     Tox_Event_Group_Join_Fail *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_message.c b/toxcore/events/group_message.c
index ab4d23d..992ad4b 100644
--- a/toxcore/events/group_message.c
+++ b/toxcore/events/group_message.c
@@ -150,7 +150,7 @@ static bool tox_event_group_message_unpack(
     Tox_Event_Group_Message *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 5)) {
+    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_moderation.c b/toxcore/events/group_moderation.c
index 5015994..f6b7d17 100644
--- a/toxcore/events/group_moderation.c
+++ b/toxcore/events/group_moderation.c
@@ -114,7 +114,7 @@ static bool tox_event_group_moderation_unpack(
     Tox_Event_Group_Moderation *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4)) {
+    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_password.c b/toxcore/events/group_password.c
index 45b2650..2bf16d3 100644
--- a/toxcore/events/group_password.c
+++ b/toxcore/events/group_password.c
@@ -105,7 +105,7 @@ static bool tox_event_group_password_unpack(
     Tox_Event_Group_Password *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_peer_exit.c b/toxcore/events/group_peer_exit.c
index 20d11b2..81085d3 100644
--- a/toxcore/events/group_peer_exit.c
+++ b/toxcore/events/group_peer_exit.c
@@ -172,7 +172,7 @@ static bool tox_event_group_peer_exit_unpack(
     Tox_Event_Group_Peer_Exit *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 5)) {
+    if (!bin_unpack_array_fixed(bu, 5, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_peer_join.c b/toxcore/events/group_peer_join.c
index cff0e68..d872611 100644
--- a/toxcore/events/group_peer_join.c
+++ b/toxcore/events/group_peer_join.c
@@ -84,7 +84,7 @@ static bool tox_event_group_peer_join_unpack(
     Tox_Event_Group_Peer_Join *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_peer_limit.c b/toxcore/events/group_peer_limit.c
index 0cdf6c4..2c1f21d 100644
--- a/toxcore/events/group_peer_limit.c
+++ b/toxcore/events/group_peer_limit.c
@@ -84,7 +84,7 @@ static bool tox_event_group_peer_limit_unpack(
     Tox_Event_Group_Peer_Limit *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_peer_name.c b/toxcore/events/group_peer_name.c
index b5eb859..6de3045 100644
--- a/toxcore/events/group_peer_name.c
+++ b/toxcore/events/group_peer_name.c
@@ -120,7 +120,7 @@ static bool tox_event_group_peer_name_unpack(
     Tox_Event_Group_Peer_Name *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_peer_status.c b/toxcore/events/group_peer_status.c
index b5e63b6..0a290e9 100644
--- a/toxcore/events/group_peer_status.c
+++ b/toxcore/events/group_peer_status.c
@@ -99,7 +99,7 @@ static bool tox_event_group_peer_status_unpack(
     Tox_Event_Group_Peer_Status *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_privacy_state.c b/toxcore/events/group_privacy_state.c
index caa00f0..dfad858 100644
--- a/toxcore/events/group_privacy_state.c
+++ b/toxcore/events/group_privacy_state.c
@@ -84,7 +84,7 @@ static bool tox_event_group_privacy_state_unpack(
     Tox_Event_Group_Privacy_State *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_private_message.c b/toxcore/events/group_private_message.c
index f5af54a..9fed263 100644
--- a/toxcore/events/group_private_message.c
+++ b/toxcore/events/group_private_message.c
@@ -135,7 +135,7 @@ static bool tox_event_group_private_message_unpack(
     Tox_Event_Group_Private_Message *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 4)) {
+    if (!bin_unpack_array_fixed(bu, 4, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_topic.c b/toxcore/events/group_topic.c
index c9d8152..ca213e9 100644
--- a/toxcore/events/group_topic.c
+++ b/toxcore/events/group_topic.c
@@ -120,7 +120,7 @@ static bool tox_event_group_topic_unpack(
     Tox_Event_Group_Topic *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 3)) {
+    if (!bin_unpack_array_fixed(bu, 3, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_topic_lock.c b/toxcore/events/group_topic_lock.c
index 898fe6e..b9c2c27 100644
--- a/toxcore/events/group_topic_lock.c
+++ b/toxcore/events/group_topic_lock.c
@@ -84,7 +84,7 @@ static bool tox_event_group_topic_lock_unpack(
     Tox_Event_Group_Topic_Lock *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }
 
diff --git a/toxcore/events/group_voice_state.c b/toxcore/events/group_voice_state.c
index 8169efa..efc9d13 100644
--- a/toxcore/events/group_voice_state.c
+++ b/toxcore/events/group_voice_state.c
@@ -84,7 +84,7 @@ static bool tox_event_group_voice_state_unpack(
     Tox_Event_Group_Voice_State *event, Bin_Unpack *bu)
 {
     assert(event != nullptr);
-    if (!bin_unpack_array_fixed(bu, 2)) {
+    if (!bin_unpack_array_fixed(bu, 2, nullptr)) {
         return false;
     }