diff --git a/src/friendlist.c b/src/friendlist.c
index a104930..c4f273f 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -182,7 +182,6 @@ static void delete_friend(Tox *m, ToxWindow *self, int f_num, wint_t key)
 
     sort_friendlist_index();
     store_data(m, DATA_FILE);
-    select_friend(m, KEY_DOWN);
 }
 
 static void friendlist_onKey(ToxWindow *self, Tox *m, wint_t key)
diff --git a/src/groupchat.c b/src/groupchat.c
index 7ab4160..1f60ea9 100644
--- a/src/groupchat.c
+++ b/src/groupchat.c
@@ -57,7 +57,7 @@ int init_groupchat_win(ToxWindow *prompt, Tox *m, int groupnum)
 static void close_groupchatwin(Tox *m, int groupnum)
 {
     tox_del_groupchat(m, groupnum);
-    memset(&(groupchats[groupnum]), 0, sizeof(GroupChat));
+    memset(&groupchats[groupnum], 0, sizeof(GroupChat));
 
     int i;
 
diff --git a/src/main.c b/src/main.c
index efb9ca1..4747cd5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -348,7 +348,7 @@ static void load_data(Tox *m, char *path)
     }
 }
 
-static void close_file_sender(Tox *m, int i)
+static void close_file_sender(int i)
 {
     fclose(file_senders[i].file);
     memset(&file_senders[i], 0, sizeof(FileSender));
@@ -385,7 +385,7 @@ static void do_file_senders(Tox *m)
                     wprintw(file_senders[i].chatwin, "File transfer for '%s' timed out.\n",
                             pathname);
                     tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_KILL, 0, 0);
-                    close_file_sender(m, i);
+                    close_file_sender(i);
                 }
 
                 break;
@@ -398,7 +398,7 @@ static void do_file_senders(Tox *m)
             if (file_senders[i].piecelen == 0) {
                 wprintw(file_senders[i].chatwin, "File '%s' successfuly sent.\n", pathname);
                 tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_FINISHED, 0, 0);
-                close_file_sender(m, i);
+                close_file_sender(i);
                 break;
             }
         }