diff --git a/ground/src/plugins/coreplugin/uavgadgetinstancemanager.cpp b/ground/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
index fcb93cf10..8e7f9b938 100644
--- a/ground/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
+++ b/ground/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
@@ -132,9 +132,11 @@ void UAVGadgetInstanceManager::createOptionsPages()
     {
         IUAVGadgetFactory *f = factory(config->classId());
         IOptionsPage *p = f->createOptionsPage(config);
-        IOptionsPage *page = new UAVGadgetOptionsPageDecorator(p, config);
-        m_optionsPages.append(page);
-        m_pm->addObject(page);
+        if (p) {
+            IOptionsPage *page = new UAVGadgetOptionsPageDecorator(p, config);
+            m_optionsPages.append(page);
+            m_pm->addObject(page);
+        }
     }
 }
 
diff --git a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserfactory.cpp b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserfactory.cpp
index 0a5d53d3a..dde69afa7 100644
--- a/ground/src/plugins/uavobjectbrowser/uavobjectbrowserfactory.cpp
+++ b/ground/src/plugins/uavobjectbrowser/uavobjectbrowserfactory.cpp
@@ -53,6 +53,6 @@ IUAVGadgetConfiguration *UAVObjectBrowserFactory::createConfiguration(const QByt
 
 IOptionsPage *UAVObjectBrowserFactory::createOptionsPage(IUAVGadgetConfiguration *config)
 {
-    return new UAVObjectBrowserOptionsPage(qobject_cast<UAVObjectBrowserConfiguration*>(config));
+    return 0;// new UAVObjectBrowserOptionsPage(qobject_cast<UAVObjectBrowserConfiguration*>(config));
 }
 
diff --git a/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp b/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
index 337c90370..5e5033006 100644
--- a/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
+++ b/ground/src/plugins/uavobjectbrowser/uavobjecttreemodel.cpp
@@ -30,14 +30,7 @@
 #include "uavobjects/uavobjectmanager.h"
 #include "uavobjects/uavdataobject.h"
 #include "uavobjects/uavmetaobject.h"
-#include "uavobjects/uavobjectfieldenum.h"
-#include "uavobjects/uavobjectfielduint8.h"
-#include "uavobjects/uavobjectfielduint16.h"
-#include "uavobjects/uavobjectfielduint32.h"
-#include "uavobjects/uavobjectfieldint8.h"
-#include "uavobjects/uavobjectfieldint16.h"
-#include "uavobjects/uavobjectfieldint32.h"
-#include "uavobjects/uavobjectfieldfloat.h"
+#include "uavobjects/uavobjectfields.h"
 #include "extensionsystem/pluginmanager.h"
 #include <QtGui/QColor>
 #include <QtCore/QDebug>