diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index d10685839bdcd8802c6cec72b5d08c5f0ee64578..8ed2ee9712ab650fb8a972fa6a0a1bbcfe7f4d5b 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -782,6 +782,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
     storeSettings();
     mavlink->storeSettings();
     UASManager::instance()->storeSettings();
+    // FIXME: If connected links, should prompt before close
+    LinkManager::instance()->disconnectAll();
     event->accept();
 }
 
@@ -1039,7 +1041,7 @@ void MainWindow::enableAutoReconnect(bool enabled)
 
 bool MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style)
 {
-    qDebug() << "LOAD STYLE" << style;
+    //qDebug() << "LOAD STYLE" << style;
     bool success = true;
     QString styles;
     
@@ -1587,7 +1589,7 @@ void MainWindow::loadViewState()
         {
             if (widgetname != "")
             {
-                qDebug() << "Loading widget:" << widgetname;
+                //qDebug() << "Loading widget:" << widgetname;
                 loadDockWidget(widgetname);
             }
         }