diff --git a/c++/jack_utils.h b/c++/jack_utils.h
index f427642..0509edb 100644
--- a/c++/jack_utils.h
+++ b/c++/jack_utils.h
@@ -23,7 +23,7 @@
 #include <jack/transport.h>
 
 #ifdef HAVE_JACKSESSION
-# include <jack/session.h>
+ #include <jack/session.h>
 #endif
 
 #include <cstring>
diff --git a/c++/jackmeter/jackmeter.cpp b/c++/jackmeter/jackmeter.cpp
index 5a00614..607ede9 100644
--- a/c++/jackmeter/jackmeter.cpp
+++ b/c++/jackmeter/jackmeter.cpp
@@ -74,7 +74,7 @@ void port_callback(jack_port_id_t, jack_port_id_t, int, void*)
 void session_callback(jack_session_event_t* const event, void* const arg)
 {
 #ifdef Q_OS_LINUX
-    QString filepath("cadence_jackmeter");
+    QString filepath("cadence-jackmeter");
     Q_UNUSED(arg);
 #else
     QString filepath((char*)arg);
diff --git a/c++/queue.h b/c++/midi_queue.h
similarity index 100%
rename from c++/queue.h
rename to c++/midi_queue.h
diff --git a/c++/xycontroller/qtcreator/xycontroller.pro b/c++/xycontroller/qtcreator/xycontroller.pro
index 3891f0e..78b5790 100644
--- a/c++/xycontroller/qtcreator/xycontroller.pro
+++ b/c++/xycontroller/qtcreator/xycontroller.pro
@@ -18,6 +18,7 @@ SOURCES  = \
 
 HEADERS  = \
     ../../jack_utils.h \
+    ../../midi_queue.h \
     ../../widgets/pixmapdial.h \
     ../../widgets/pixmapkeyboard.h
 
diff --git a/c++/xycontroller/xycontroller.cpp b/c++/xycontroller/xycontroller.cpp
index 93bf1c2..b101d3f 100644
--- a/c++/xycontroller/xycontroller.cpp
+++ b/c++/xycontroller/xycontroller.cpp
@@ -24,7 +24,7 @@
 #define VERSION "0.5.0"
 
 #include "../jack_utils.h"
-#include "../queue.h"
+#include "../midi_queue.h"
 #include "ui_xycontroller.h"
 
 #include <QtCore/QSettings>
@@ -624,7 +624,7 @@ protected slots:
         ui->act_ch_16->setChecked(true);
 
 #ifdef Q_COMPILER_INITIALIZER_LISTS
-        m_channels = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+        m_channels = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
 #else
         m_channels.clear();
 
@@ -746,11 +746,13 @@ protected:
             }
         }
         else
+        {
 #ifdef Q_COMPILER_INITIALIZER_LISTS
             m_channels = { 1 };
 #else
             m_channels << 1;
 #endif
+        }
 
         scene.setChannels(m_channels);
 
@@ -920,7 +922,7 @@ int process_callback(const jack_nframes_t nframes, void*)
 void session_callback(jack_session_event_t* const event, void* const arg)
 {
 #ifdef Q_OS_LINUX
-    QString filepath("cadence_xycontroller");
+    QString filepath("cadence-xycontroller");
     Q_UNUSED(arg);
 #else
     QString filepath((char*)arg);