2 files changed, 2 insertions, 2 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index f0bc3de4..bdfe120f 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -456,7 +456,7 @@ void addto_lists(DHT *dht, IP_Port ip_port, uint8_t *client_id)
     uint32_t i;
 
     /* convert IPv4-in-IPv6 to IPv4 */
-    if ((ip_port.ip.family == AF_INET6) && IN6_IS_ADDR_V4MAPPED(&ip_port.ip.ip6)) {
+    if ((ip_port.ip.family == AF_INET6) && IN6_IS_ADDR_V4MAPPED(&ip_port.ip.ip6.in6_addr)) {
         ip_port.ip.family = AF_INET;
         ip_port.ip.ip4.uint32 = ip_port.ip.ip6.uint32[3];
     }
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 0efe20ce..f125c264 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -708,7 +708,7 @@ static void group_message_function(Group_Chat *chat, int peer_number, uint8_t *m
     }
 
     if (m->group_message)
-        (*m->group_message)(m, i, peer_number, message, length, m->group_invite_userdata);
+        (*m->group_message)(m, i, peer_number, message, length, m->group_message_userdata);
 }
 
 /* Creates a new groupchat and puts it in the chats array.