diff --git a/src/line_info.h b/src/line_info.h
index 7357476..c7af681 100644
--- a/src/line_info.h
+++ b/src/line_info.h
@@ -36,7 +36,7 @@ struct line_info {
     uint8_t timestamp[TIME_STR_SIZE];
     uint8_t name1[TOXIC_MAX_NAME_LENGTH];
     uint8_t name2[TOXIC_MAX_NAME_LENGTH];
-    uint8_t msg[MAX_STR_SIZE];
+    uint8_t msg[TOX_MAX_MESSAGE_LENGTH];
     uint8_t type;
     uint8_t bold;
     uint8_t colour;
diff --git a/src/main.c b/src/main.c
index 613c988..cce2d62 100644
--- a/src/main.c
+++ b/src/main.c
@@ -304,7 +304,7 @@ static void do_connection(Tox *m, ToxWindow *prompt)
 
 static void load_friendlist(Tox *m)
 {
-    int32_t i;
+    uint32_t i;
     uint32_t numfriends = tox_count_friendlist(m);
 
     for (i = 0; i < numfriends; ++i)
@@ -506,7 +506,6 @@ int main(int argc, char *argv[])
     }
 
     memset(user_settings, 0, sizeof(struct user_settings));
-
     int settings_err = settings_load(user_settings, NULL);
 
     init_term();