diff --git a/ground/src/plugins/config/configgadgetoptionspage.cpp b/ground/src/plugins/config/configgadgetoptionspage.cpp
index 8079fbd7f..de8cb2d1a 100644
--- a/ground/src/plugins/config/configgadgetoptionspage.cpp
+++ b/ground/src/plugins/config/configgadgetoptionspage.cpp
@@ -26,6 +26,8 @@
  */
 #include "configgadgetoptionspage.h"
 
+#include <QWidget>
+
 ConfigGadgetOptionsPage::ConfigGadgetOptionsPage(ConfigGadgetConfiguration *config, QObject *parent)
 {
 //todo:implement
@@ -34,7 +36,7 @@ ConfigGadgetOptionsPage::ConfigGadgetOptionsPage(ConfigGadgetConfiguration *conf
 QWidget *ConfigGadgetOptionsPage::createPage(QWidget *parent)
 {
     //todo:implement
-    return parent;
+    return new QWidget;
 }
 
 void ConfigGadgetOptionsPage::apply()
diff --git a/ground/src/plugins/notify/notifypluginoptionspage.cpp b/ground/src/plugins/notify/notifypluginoptionspage.cpp
index d888227d9..80911c48c 100644
--- a/ground/src/plugins/notify/notifypluginoptionspage.cpp
+++ b/ground/src/plugins/notify/notifypluginoptionspage.cpp
@@ -217,14 +217,14 @@ void NotifyPluginOptionsPage::on_UAVObject_indexChanged(QString val) {
 // locate collection folder on disk
 void NotifyPluginOptionsPage::on_buttonSoundFolder_clicked(const QString& path)
 {
-	disconnect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
+	//disconnect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
 
 	QDir dirPath(path);
 	listDirCollections = dirPath.entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
 	options_page->SoundCollectionList->clear();
 	options_page->SoundCollectionList->addItems(listDirCollections);
 
-	connect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
+	//connect(options_page->SoundCollectionList, SIGNAL(currentIndexChanged (int)), this, SLOT(on_soundLanguage_indexChanged(int)));
 }
 
 
diff --git a/ground/src/plugins/plugins.pro b/ground/src/plugins/plugins.pro
index 9d0b77708..5a96814e6 100644
--- a/ground/src/plugins/plugins.pro
+++ b/ground/src/plugins/plugins.pro
@@ -103,12 +103,6 @@ plugin_notify.depends = plugin_coreplugin
 plugin_notify.depends = plugin_uavobjects
 SUBDIRS += plugin_notify
 
-
-#Config Gadget
-#plugin_config.subdir = config
-#plugin_config.depends = plugin_coreplugin
-#SUBDIRS += plugin_config
-
 #HITL simulation Gadget
 plugin_hitl.subdir = hitl
 plugin_hitl.depends = plugin_coreplugin
@@ -116,3 +110,7 @@ plugin_hitl.depends += plugin_uavobjects
 plugin_hitl.depends += plugin_uavtalk
 SUBDIRS += plugin_hitl
 
+#Config Gadget
+plugin_config.subdir = config
+plugin_config.depends = plugin_coreplugin
+SUBDIRS += plugin_config