diff --git a/src/chat.c b/src/chat.c
index 9f98b91..a2db07a 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -579,7 +579,7 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int32_t friendnumber, co
     Friends.list[friendnumber].group_invite.pending = true;
     Friends.list[friendnumber].group_invite.length = length;
 
-    char name[TOX_MAX_NAME_LENGTH + 1];
+    char name[TOX_MAX_NAME_LENGTH];
     get_nick_truncate(m, name, friendnumber);
 
     sound_notify(self, generic_message, NT_WNDALERT_2, NULL);
diff --git a/src/groupchat.c b/src/groupchat.c
index 48c1eaf..76f0d00 100644
--- a/src/groupchat.c
+++ b/src/groupchat.c
@@ -147,8 +147,8 @@ static void groupchat_onGroupMessage(ToxWindow *self, Tox *m, int groupnum, int
 
     int nick_clr = strcmp(nick, selfnick) == 0 ? GREEN : CYAN;
 
-    /* Only play sound if mentioned */
-    if (strcasestr(msg, selfnick)) {
+    /* Only play sound if mentioned by someone else */
+    if (strcasestr(msg, selfnick) && strcmp(selfnick, nick)) {
         sound_notify(self, generic_message, NT_WNDALERT_0, NULL);
                 
         if (self->active_box != -1)
diff --git a/src/windows.c b/src/windows.c
index b667dbf..e8f0b15 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -104,7 +104,7 @@ void on_action(Tox *m, int32_t friendnumber, const uint8_t *string, uint16_t len
 
     for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onAction != NULL)
-            windows[i].onAction(&windows[i], m, friendnumber, (const char *) string, length);
+            windows[i].onAction(&windows[i], m, friendnumber, msg, length);
     }
 }