diff --git a/effects.c b/effects.c
index 9388322..aeaa6e0 100644
--- a/effects.c
+++ b/effects.c
@@ -15,6 +15,7 @@
  */
 
 #include "gdigi.h"
+#include "gui.h"
 #include "effects.h"
 #include "gdigi_xml.h"
 
@@ -4097,7 +4098,7 @@ XmlSettings xml_settings[] = {
     {UNOVIBE_PEDAL_SPEED, CHORUSFX_POSITION, "Unovibe Speed", &values_0_to_99,},
     {UNOVIBE_INTENSITY, CHORUSFX_POSITION, "Unovibe Intensity", &values_0_to_99,},
     {UNOVIBE_VOLUME, CHORUSFX_POSITION, "Unovibe Volume", &values_0_to_99,},
-    {UNOVIBE_CHORUS_VIBRATO, CHORUSFX_POSITION, "Unovibe Chorus/Vibrato", &values_chorus_vibrato, &xml_chorus_vibrato_labels, G_N_ELEMENTS(xml_chorus_vibrato_labels)},
+    {UNOVIBE_CHORUS_VIBRATO, CHORUSFX_POSITION, "Unovibe Chorus/Vibrato", &values_chorus_vibrato, xml_chorus_vibrato_labels, G_N_ELEMENTS(xml_chorus_vibrato_labels)},
 
     {TREMOLO_SPEED, CHORUSFX_POSITION, "Tremolo Speed", &values_0_to_99,},
     {TREMOLO_DEPTH, CHORUSFX_POSITION, "Tremolo Depth", &values_0_to_99,},
diff --git a/gdigi.c b/gdigi.c
index 25ea56d..1ca93ae 100644
--- a/gdigi.c
+++ b/gdigi.c
@@ -388,7 +388,7 @@ MessageID get_message_id(GString *msg)
 
 #define HEX_WIDTH 26
 
-static guint modifier_linkable_list_request_pending;
+static gboolean modifier_linkable_list_request_pending = FALSE;
 
 void push_message(GString *msg)
 {
@@ -488,7 +488,7 @@ void push_message(GString *msg)
 
                 if (!modifier_linkable_list_request_pending) {
                     send_message(REQUEST_MODIFIER_LINKABLE_LIST, "\x00\x01", 2);
-                    modifier_linkable_list_request_pending = 1;
+                    modifier_linkable_list_request_pending = TRUE;
                 }
 
                 break;
@@ -533,7 +533,7 @@ void push_message(GString *msg)
 
         case RECEIVE_MODIFIER_LINKABLE_LIST:
 
-            modifier_linkable_list_request_pending = 0;
+            modifier_linkable_list_request_pending = FALSE;
             unpack_message(msg);
             tot = (unsigned char)msg->str[9];
 
diff --git a/gui.c b/gui.c
index 3ee1205..c6c9c7d 100644
--- a/gui.c
+++ b/gui.c
@@ -858,8 +858,6 @@ create_modifier_group (guint pos, guint id)
      */
     g_tree_steal(widget_tree, key);
     if (!list) {
-        g_warning("No widget tree entry for position %d id %d!\n",
-                   pos, id);
         return;
     }