diff --git a/src/autocomplete.c b/src/autocomplete.c
index 1c7c94b..5b6af44 100644
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@@ -209,7 +209,7 @@ static void complt_home_dir(ToxWindow *self, char *path, int pathsize, const cha
 {
     ChatContext *ctx = self->chatwin;
 
-    char homedir[MAX_STR_SIZE];
+    char homedir[MAX_STR_SIZE] = {0};
     get_home_dir(homedir, sizeof(homedir));
 
     char newline[MAX_STR_SIZE];
diff --git a/src/configdir.c b/src/configdir.c
index 9bc6744..8a9f60c 100644
--- a/src/configdir.c
+++ b/src/configdir.c
@@ -66,7 +66,7 @@ void get_home_dir(char *home, int size)
  */
 char *get_user_config_dir(void)
 {
-    char home[NSS_BUFLEN_PASSWD];
+    char home[NSS_BUFLEN_PASSWD] = {0};
     get_home_dir(home, sizeof(home));
 
     char *user_config_dir;
diff --git a/src/settings.c b/src/settings.c
index 95bd487..ff490e0 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -289,7 +289,7 @@ int settings_load(struct user_settings *s, const char *patharg)
 
         if ( config_setting_lookup_string(setting, tox_strings.avatar_path, &str) ) {
             snprintf(s->avatar_path, sizeof(s->avatar_path), "%s", str);
-            int len = strlen(s->avatar_path);
+            int len = strlen(str);
 
             if (len >= sizeof(s->avatar_path)) 
                 s->avatar_path[0] = '\0';