diff --git a/src/chat.c b/src/chat.c
index bb4708d..4bd03c8 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -288,10 +288,11 @@ static void chat_onKey(ToxWindow *self, Tox *m, wint_t key)
     } else
     /* Add printable chars to buffer and print on input space */
 #if HAVE_WIDECHAR
-    if (iswprint(key)) {
+    if (iswprint(key))
 #else
-    if (isprint(key)) {
+    if (isprint(key))
 #endif
+    {
         if (ctx->pos < (MAX_STR_SIZE-1)) {
             mvwaddstr(self->window, y, x, wc_to_char(key));
             ctx->line[ctx->pos++] = key;
diff --git a/src/friendlist.c b/src/friendlist.c
index 3c8c260..d2ab2cd 100644
--- a/src/friendlist.c
+++ b/src/friendlist.c
@@ -113,7 +113,6 @@ static void friendlist_onFriendAdded(ToxWindow *self, Tox *m, int num)
             friends[i].online = false;
             friends[i].status = TOX_USERSTATUS_NONE;
             friends[i].namelength = tox_getname(m, num, friends[i].name);
-            memset(friends[i].pending_groupchat, 0, TOX_CLIENT_ID_SIZE);
 
             if (friends[i].namelength == -1 || friends[i].name[0] == '\0') {
                 strcpy(friends[i].name, (uint8_t *) UNKNOWN_NAME);
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index b81f0d5..e589e01 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -127,6 +127,7 @@ uint8_t num_file_senders;
 typedef struct {
     uint8_t filenames[MAX_FILES][MAX_STR_SIZE];
     bool pending[MAX_FILES];
+    bool active[MAX_FILES];
 } FileReceiver;
 
 /* End file transfer code */