diff --git a/audio/test/snr.c b/audio/test/snr.c
index 6f1e454d6a..f2c07cade0 100644
--- a/audio/test/snr.c
+++ b/audio/test/snr.c
@@ -202,8 +202,6 @@ static void set_alias_power(struct snr_result *res, unsigned freq, double power)
    }
 }
 
-// This doesn't yet take account for slight phase distortions,
-// so reported SNR is lower than reality.
 static void calculate_snr(struct snr_result *res,
       unsigned in_rate, unsigned max_rate,
       const float *resamp, complex double *butterfly_buf, size_t samples)
diff --git a/retroarch.c b/retroarch.c
index 0d6387a1fc..9d276697e3 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1165,13 +1165,19 @@ static void deinit_recording(void)
 
 static void init_msg_queue(void)
 {
+   if (g_extern.msg_queue)
+      return;
+
    rarch_assert(g_extern.msg_queue = msg_queue_new(8));
 }
 
 static void deinit_msg_queue(void)
 {
    if (g_extern.msg_queue)
+   {
       msg_queue_free(g_extern.msg_queue);
+      g_extern.msg_queue = NULL;
+   }
 }
 
 #ifdef HAVE_XML
@@ -2328,10 +2334,7 @@ int rarch_main_init(int argc, char *argv[])
       goto error;
 
    init_system_av_info();
-#ifndef RARCH_CONSOLE
-   //we have to init the message queue way in advance for console ports
    init_msg_queue();
-#endif
 
    if (!g_extern.sram_load_disable)
       load_save_files();