diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index 80e6fc42e64efa2492e44684a0ddfeed2e465239..9c9e1d82ade21a6cc64e630ac1496a10f59731a2 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -1,21 +1,3 @@
-#
-# [REQUIRED] Tell the Linux build to look in a few additional places for libs
-#
-LinuxBuild {
-	INCLUDEPATH += \
-        /usr/include \
-        /usr/local/include
-
-	LIBS += \
-		-L/usr/lib
-
-    linux-g++-64 {
-        LIBS += \
-            -L/usr/local/lib64 \
-            -L/usr/lib64
-	}
-}
-
 #
 # [REQUIRED] Add support for <inttypes.h> to Windows.
 #
@@ -311,13 +293,15 @@ contains(DEFINES, DISABLE_XBEE) {
 } else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_XBEE) {
     message("Skipping support for native XBee API (manual override from user_config.pri)")
 } else:LinuxBuild {
-	exists(/usr/include/xbee.h) {
+        linux-g++-64 {
+            message("Skipping support for XBee API (64-bit Linux builds not supported)")
+        } else:exists(/usr/include/xbee.h) {
 		message("Including support for XBee API")
 
 		HEADERS += $$XBEE_DEPENDENT_HEADERS
 		SOURCES += $$XBEE_DEPENDENT_SOURCES
 		DEFINES += $$XBEE_DEFINES
-		LIBS += -lxbee
+		LIBS += -L/usr/lib -lxbee
 	} else {
 		warning("Skipping support for XBee API (missing libraries, see README)")
 	}
diff --git a/QGCSetup.pri b/QGCSetup.pri
index 46bdebb66fa2ca5fcae0ade454af1d7fde9a3ad2..eea95719948d6902c3e51a8644785682e93c0c57 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -159,11 +159,8 @@ WindowsBuild {
 	DESTDIR_WIN = $$replace(DESTDIR, "/", "\\")
 	D_DIR = $$[QT_INSTALL_LIBEXECS]
 	DLL_DIR = $$replace(D_DIR, "/", "\\")
-	P_DIR = $$[QT_INSTALL_PLUGINS]
-	PLUGIN_DIR = $$replace(P_DIR, "/", "\\")
 
 	# Copy dependencies
-
 	DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
diff --git a/src/ui/QGCVehicleConfig.cc b/src/ui/QGCVehicleConfig.cc
index 98ce31537d5521ee61a6c0a074d8aea33a5d2c74..06121d1d5a43d09bfd60e9bbe27bbc5dbce86739 100644
--- a/src/ui/QGCVehicleConfig.cc
+++ b/src/ui/QGCVehicleConfig.cc
@@ -104,8 +104,13 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) :
     connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateView()));
     updateTimer.start();
 
-    ui->advancedGroupBox->hide();
-    connect(ui->advancedCheckBox,SIGNAL(toggled(bool)),ui->advancedGroupBox,SLOT(setShown(bool)));
+    // Make sure the advanced features match what the checkbox indicates on startup and listen for
+    // future changes.
+    if (!ui->advancedCheckBox->isChecked())
+    {
+        ui->advancedGroupBox->hide();
+    }
+    connect(ui->advancedCheckBox, SIGNAL(toggled(bool)), ui->advancedGroupBox,SLOT(setVisible(bool)));
 }
 void QGCVehicleConfig::rcMenuButtonClicked()
 {
diff --git a/src/ui/linechart/IncrementalPlot.cc b/src/ui/linechart/IncrementalPlot.cc
index a06077dab34213a58ab6b6d811d601d87cb37abc..705a1a984720ac68314fc34094666eccc7e67c48 100644
--- a/src/ui/linechart/IncrementalPlot.cc
+++ b/src/ui/linechart/IncrementalPlot.cc
@@ -100,8 +100,6 @@ IncrementalPlot::IncrementalPlot(QWidget *parent):
     resetScaling();
 
     legend = NULL;
-
-    connect(this, SIGNAL(legendChecked(QwtPlotItem*,bool)), this, SLOT(handleLegendClick(QwtPlotItem*,bool)));
 }
 
 IncrementalPlot::~IncrementalPlot()