diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index bf40ccbe5df7fdd418e31ddd5cdd8d1e4b64abba..e16bb0d80b83fe09bae7f3cd4eef93b13e2e1eb6 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -71,8 +71,8 @@ macx {
         #CONFIG -= x86 # phonon
         #message(Building for Mac OS X 64bit/Snow Leopard 10.6 and later)
       #          debug {
-                        QMAKE_CXXFLAGS += -finstrument-functions
-                        LIBS += -lSaturn
+                        #QMAKE_CXXFLAGS += -finstrument-functions
+                        #LIBS += -lSaturn
                         CONFIG += console
       #          }
     #}
diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc
index 5576c1d88ad92ea48a6ad88f2a4575d6dfa12a26..40e1ed1f582e1a7d95f8726ef79ec44165e4632d 100644
--- a/src/ui/DebugConsole.cc
+++ b/src/ui/DebugConsole.cc
@@ -255,30 +255,32 @@ void DebugConsole::setAutoHold(bool hold)
 void DebugConsole::receiveTextMessage(int id, int component, int severity, QString text)
 {
     Q_UNUSED(severity);
-    QString name = UASManager::instance()->getUASForId(id)->getUASName();
-    QString comp;
-    // Get a human readable name if possible
-    switch (component) {
-        // TODO: To be completed
-    case MAV_COMP_ID_IMU:
-        comp = tr("IMU");
-        break;
-    case MAV_COMP_ID_MAPPER:
-        comp = tr("MAPPER");
-        break;
-    case MAV_COMP_ID_WAYPOINTPLANNER:
-        comp = tr("WP-PLANNER");
-        break;
-    case MAV_COMP_ID_AIRSLAM:
-        comp = tr("AIRSLAM");
-        break;
-    default:
-        comp = QString::number(component);
-        break;
-    }
+    if (isVisible())
+    {
+        QString name = UASManager::instance()->getUASForId(id)->getUASName();
+        QString comp;
+        // Get a human readable name if possible
+        switch (component) {
+            // TODO: To be completed
+        case MAV_COMP_ID_IMU:
+            comp = tr("IMU");
+            break;
+        case MAV_COMP_ID_MAPPER:
+            comp = tr("MAPPER");
+            break;
+        case MAV_COMP_ID_WAYPOINTPLANNER:
+            comp = tr("WP-PLANNER");
+            break;
+        case MAV_COMP_ID_SYSTEM_CONTROL:
+            comp = tr("SYS-CONTROL");
+            break;
+        default:
+            comp = QString::number(component);
+            break;
+        }
 
-    m_ui->receiveText->appendHtml(QString("<font color=\"%1\">(%2:%3) %4</font>\n").arg(UASManager::instance()->getUASForId(id)->getColor().name(), name, comp, text));
-    //m_ui->receiveText->appendPlainText("");
+        m_ui->receiveText->appendHtml(QString("<font color=\"%1\">(%2:%3) %4</font>\n").arg(UASManager::instance()->getUASForId(id)->getColor().name(), name, comp, text));
+    }
 }
 
 void DebugConsole::updateTrafficMeasurements()
@@ -431,11 +433,13 @@ void DebugConsole::receiveBytes(LinkInterface* link, QByteArray bytes)
             }
 
         }
-        if (lineBuffer.length() > 0)
-        {
-            m_ui->receiveText->insertPlainText(lineBuffer);
-            // Ensure text area scrolls correctly
-            m_ui->receiveText->ensureCursorVisible();
+        if (lineBuffer.length() > 0) {
+            if (isVisible())
+            {
+                m_ui->receiveText->insertPlainText(lineBuffer);
+                // Ensure text area scrolls correctly
+                m_ui->receiveText->ensureCursorVisible();
+            }
             lineBuffer.clear();
         }
     }
diff --git a/src/ui/uas/UASInfoWidget.h b/src/ui/uas/UASInfoWidget.h
index 034f7f309364bc2e196cbfd572ddef9e861f459d..81a8179e66b0630443272f1347c892ffc726a0db 100644
--- a/src/ui/uas/UASInfoWidget.h
+++ b/src/ui/uas/UASInfoWidget.h
@@ -95,7 +95,7 @@ protected:
     QString name;
     quint64 startTime;
     QMap<QString, int> errors;
-    static const int updateInterval = 200; ///< Refresh interval in milliseconds
+    static const int updateInterval = 800; ///< Refresh interval in milliseconds
 
     void showEvent(QShowEvent* event);
     void hideEvent(QHideEvent* event);