diff --git a/configure.ac b/configure.ac
index 4e239831..ca9d8479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ PKG_CHECK_MODULES([DEPS], [openssl glib-2.0 libcurl])
 PKG_CHECK_MODULES([NOTIFY], [libnotify], [], 
     [AC_MSG_NOTICE([libnotify module not found])])
 
-AM_CFLAGS="-Wall -Werror"
+AM_CFLAGS="-Wall"
 LIBS="$LIBS $DEPS_LIBS $NOTIFY_LIBS"
 
 AM_CPPFLAGS="$DEPS_CFLAGS $NOTIFY_CFLAGS"
diff --git a/src/command.c b/src/command.c
index 096b06cc..5e436f04 100644
--- a/src/command.c
+++ b/src/command.c
@@ -651,6 +651,8 @@ cmd_close(void)
     p_autocomplete_clear(who_ac);
     p_autocomplete_clear(help_ac);
     p_autocomplete_clear(notify_ac);
+    p_autocomplete_clear(sub_ac);
+    p_autocomplete_clear(log_ac);
 }
 
 // Command autocompletion functions
diff --git a/src/main.c b/src/main.c
index fa84cf7b..5d6069f1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -48,6 +48,7 @@ main(int argc, char **argv)
     g_option_context_add_main_entries(context, entries, NULL);
     if (!g_option_context_parse(context, &argc, &argv, &error)) {
         g_print("%s\n", error->message);
+        g_option_context_free(context);
         return 1;
     }
 
diff --git a/src/parser.c b/src/parser.c
index ea26725c..4b0fcede 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -92,13 +92,15 @@ parse_args(const char * const inp, int min, int max)
     // if num args not valid return NULL
     if ((num < min) || (num > max)) {
         g_slist_free_full(tokens, free);
-        free(copy);
+        g_free(copy);
         return NULL;
 
     // if min allowed is 0 and 0 found, return empty char* array
     } else if (min == 0 && num == 0) {
+        g_slist_free_full(tokens, free);
         gchar **args = malloc((num + 1) * sizeof(*args));
         args[0] = NULL;
+        g_free(copy);
         return args;
 
     // otherwise return args array
@@ -115,7 +117,7 @@ parse_args(const char * const inp, int min, int max)
 
         args[arg_count] = NULL;
         g_slist_free_full(tokens, free);
-        free(copy);
+        g_free(copy);
 
         return args;
     }
diff --git a/src/profanity.c b/src/profanity.c
index e193d124..c7575498 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -448,7 +448,9 @@ _init(const int disable_tls, char *log_level)
     log_info("Starting Profanity (%s)...", PACKAGE_VERSION);
     chat_log_init();
     prefs_load();
-    theme_load(prefs_get_theme());
+    gchar *theme = prefs_get_theme();
+    theme_load(theme);
+    g_free(theme);
     ui_init();
     jabber_init(disable_tls);
     cmd_init();
diff --git a/src/theme.c b/src/theme.c
index 6274b647..e149bc87 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -153,6 +153,7 @@ void
 theme_close(void)
 {
     g_key_file_free(theme);
+    g_string_free(theme_loc, TRUE);
 }
 
 void
@@ -230,79 +231,105 @@ _load_colours(void)
 {
     gchar *bkgnd_val = g_key_file_get_string(theme, "colours", "bkgnd", NULL);
     _set_colour(bkgnd_val, &colour_prefs.bkgnd, -1);
+    g_free(bkgnd_val);
 
     gchar *titlebar_val = g_key_file_get_string(theme, "colours", "titlebar", NULL);
     _set_colour(titlebar_val, &colour_prefs.titlebar, COLOR_BLUE);
+    g_free(titlebar_val);
 
     gchar *statusbar_val = g_key_file_get_string(theme, "colours", "statusbar", NULL);
     _set_colour(statusbar_val, &colour_prefs.statusbar, COLOR_BLUE);
+    g_free(statusbar_val);
 
     gchar *titlebartext_val = g_key_file_get_string(theme, "colours", "titlebartext", NULL);
     _set_colour(titlebartext_val, &colour_prefs.titlebartext, COLOR_WHITE);
+    g_free(titlebartext_val);
 
     gchar *titlebarbrackets_val = g_key_file_get_string(theme, "colours", "titlebarbrackets", NULL);
     _set_colour(titlebarbrackets_val, &colour_prefs.titlebarbrackets, COLOR_CYAN);
+    g_free(titlebarbrackets_val);
 
     gchar *statusbartext_val = g_key_file_get_string(theme, "colours", "statusbartext", NULL);
     _set_colour(statusbartext_val, &colour_prefs.statusbartext, COLOR_WHITE);
+    g_free(statusbartext_val);
 
     gchar *statusbarbrackets_val = g_key_file_get_string(theme, "colours", "statusbarbrackets", NULL);
     _set_colour(statusbarbrackets_val, &colour_prefs.statusbarbrackets, COLOR_CYAN);
+    g_free(statusbarbrackets_val);
 
     gchar *statusbaractive_val = g_key_file_get_string(theme, "colours", "statusbaractive", NULL);
     _set_colour(statusbaractive_val, &colour_prefs.statusbaractive, COLOR_CYAN);
+    g_free(statusbaractive_val);
 
     gchar *statusbarnew_val = g_key_file_get_string(theme, "colours", "statusbarnew", NULL);
     _set_colour(statusbarnew_val, &colour_prefs.statusbarnew, COLOR_WHITE);
+    g_free(statusbarnew_val);
 
     gchar *maintext_val = g_key_file_get_string(theme, "colours", "maintext", NULL);
     _set_colour(maintext_val, &colour_prefs.maintext, COLOR_WHITE);
+    g_free(maintext_val);
 
     gchar *splashtext_val = g_key_file_get_string(theme, "colours", "splashtext", NULL);
     _set_colour(splashtext_val, &colour_prefs.splashtext, COLOR_CYAN);
+    g_free(splashtext_val);
 
     gchar *inputtext_val = g_key_file_get_string(theme, "colours", "inputtext", NULL);
     _set_colour(inputtext_val, &colour_prefs.inputtext, COLOR_WHITE);
+    g_free(inputtext_val);
 
     gchar *timetext_val = g_key_file_get_string(theme, "colours", "timetext", NULL);
     _set_colour(timetext_val, &colour_prefs.timetext, COLOR_WHITE);
+    g_free(timetext_val);
 
     gchar *online_val = g_key_file_get_string(theme, "colours", "online", NULL);
     _set_colour(online_val, &colour_prefs.online, COLOR_GREEN);
+    g_free(online_val);
 
     gchar *away_val = g_key_file_get_string(theme, "colours", "away", NULL);
     _set_colour(away_val, &colour_prefs.away, COLOR_CYAN);
+    g_free(away_val);
 
     gchar *chat_val = g_key_file_get_string(theme, "colours", "chat", NULL);
     _set_colour(chat_val, &colour_prefs.chat, COLOR_GREEN);
+    g_free(chat_val);
 
     gchar *dnd_val = g_key_file_get_string(theme, "colours", "dnd", NULL);
     _set_colour(dnd_val, &colour_prefs.dnd, COLOR_RED);
+    g_free(dnd_val);
 
     gchar *xa_val = g_key_file_get_string(theme, "colours", "xa", NULL);
     _set_colour(xa_val, &colour_prefs.xa, COLOR_CYAN);
+    g_free(xa_val);
 
     gchar *offline_val = g_key_file_get_string(theme, "colours", "offline", NULL);
     _set_colour(offline_val, &colour_prefs.offline, COLOR_RED);
+    g_free(offline_val);
 
     gchar *typing_val = g_key_file_get_string(theme, "colours", "typing", NULL);
     _set_colour(typing_val, &colour_prefs.typing, COLOR_YELLOW);
+    g_free(typing_val);
 
     gchar *gone_val = g_key_file_get_string(theme, "colours", "gone", NULL);
     _set_colour(gone_val, &colour_prefs.gone, COLOR_RED);
+    g_free(gone_val);
 
     gchar *error_val = g_key_file_get_string(theme, "colours", "error", NULL);
     _set_colour(error_val, &colour_prefs.error, COLOR_RED);
+    g_free(error_val);
 
     gchar *incoming_val = g_key_file_get_string(theme, "colours", "incoming", NULL);
     _set_colour(incoming_val, &colour_prefs.incoming, COLOR_YELLOW);
+    g_free(incoming_val);
 
     gchar *roominfo_val = g_key_file_get_string(theme, "colours", "roominfo", NULL);
     _set_colour(roominfo_val, &colour_prefs.roominfo, COLOR_YELLOW);
+    g_free(roominfo_val);
 
     gchar *me_val = g_key_file_get_string(theme, "colours", "me", NULL);
     _set_colour(me_val, &colour_prefs.me, COLOR_YELLOW);
+    g_free(me_val);
 
     gchar *them_val = g_key_file_get_string(theme, "colours", "them", NULL);
     _set_colour(them_val, &colour_prefs.them, COLOR_GREEN);
+    g_free(them_val);
 }