diff --git a/src/main.c b/src/main.c
index 3f0a2a8..9018257 100644
--- a/src/main.c
+++ b/src/main.c
@@ -275,9 +275,8 @@ int store_data(Tox *m, char *path)
     len = tox_size(m);
     buf = malloc(len);
 
-    if (buf == NULL) {
+    if (buf == NULL)
         return 2;
-    }
 
     tox_save(m, buf);
 
@@ -334,8 +333,8 @@ static void load_data(Tox *m, char *path)
 
         uint32_t i = 0;
 
-        char name[TOX_MAX_NAME_LENGTH];
-        while (tox_getname(m, i, (uint8_t *)name) != -1) {
+        uint8_t name[TOX_MAX_NAME_LENGTH];
+        while (tox_getname(m, i, name) != -1) {
             on_friendadded(m, i);
             i++;
         }
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index 7df1f1c..a1c1269 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -20,6 +20,8 @@
 /* number of permanent default windows */
 #define N_DEFAULT_WINS 3
 
+#define UNKNOWN_NAME "Unknown"
+ 
 #ifndef TOXICVER
 #define TOXICVER "NOVER" //Use the -D flag to set this
 #endif
diff --git a/src/windows.c b/src/windows.c
index 17980ca..f24e892 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -17,8 +17,6 @@ static ToxWindow *active_window;
 static ToxWindow *prompt;
 static Tox *m;
 
-#define UNKNOWN_NAME "Unknown"
-
 /* CALLBACKS START */
 void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
 {