diff --git a/src/ui/buffer.c b/src/ui/buffer.c
index f9a7892ba..c168ebbfc 100644
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -213,12 +213,12 @@ _create_entry(const char* show_char, int pad_indent, GDateTime* time, int flags,
 static void
 _free_entry(ProfBuffEntry* entry)
 {
-    free(entry->show_char);
+    free(entry->id);
     free(entry->message);
-    free(entry->display_from);
     free(entry->from_jid);
-    free(entry->id);
-    free(entry->receipt);
+    free(entry->display_from);
     g_date_time_unref(entry->time);
+    free(entry->show_char);
+    free(entry->receipt);
     free(entry);
 }
diff --git a/src/ui/window.c b/src/ui/window.c
index 9ce7a34dc..9cbc45561 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -61,13 +61,11 @@
 #include "ui/screen.h"
 #include "xmpp/xmpp.h"
 #include "xmpp/roster_list.h"
-#include "xmpp/connection.h"
-#include "database.h"
 
-#define PAD_SIZE        1000
-#define LOADING_MESSAGE "Loading older messages…"
-#define CONS_WIN_TITLE "Profanity. Type /help for help information."
-#define XML_WIN_TITLE  "XML Console"
+static const int PAD_SIZE = 100;
+static const char* LOADING_MESSAGE = "Loading older messages…";
+static const char* CONS_WIN_TITLE = "Profanity. Type /help for help information.";
+static const char* XML_WIN_TITLE = "XML Console";
 
 #define CEILING(X) (X - (int)(X) > 0 ? (int)(X + 1) : (int)(X))