diff --git a/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp b/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
index b3d627838..358974388 100644
--- a/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notificationitem.cpp
@@ -46,9 +46,9 @@ QStringList NotificationItem::retryValues;
 
 NotificationItem::NotificationItem(QObject *parent)
     : QObject(parent)
-    , _currentUpdatePlayed(false)
     , isNowPlaying(0)
     , _isPlayed(false)
+    , _currentUpdatePlayed(false)
     , _timer(NULL)
     , _expireTimer(NULL)
     , _soundCollectionPath("")
diff --git a/ground/openpilotgcs/src/plugins/notify/notifyitemdelegate.cpp b/ground/openpilotgcs/src/plugins/notify/notifyitemdelegate.cpp
index a39405e9e..b2440762b 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifyitemdelegate.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifyitemdelegate.cpp
@@ -144,6 +144,7 @@ void NotifyItemDelegate::setModelData(QWidget *editor, QAbstractItemModel *model
 
 void NotifyItemDelegate::selectRow(const QString & text)
 {
+    Q_UNUSED(text);
     QComboBox *combo    = qobject_cast<QComboBox *>(sender());
     QTableWidget *table = new QTableWidget;
 
diff --git a/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp b/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
index 4eee0438e..56620a7b0 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.cpp
@@ -351,13 +351,6 @@ void SoundNotifyPlugin::stateChanged(QMediaPlayer::State newstate)
             playNotification(notification);
             qNotifyDebug() << "end playNotification";
         }
-    } else {
-        if (newstate == QMediaPlayer::ServiceMissingError) {
-            if (phonon.mo->error() == 0) {
-                qDebug() << "Phonon::ErrorState: ErrorType = " << phonon.mo->error();
-                phonon.mo->stop();
-            }
-        }
     }
 }
 
diff --git a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
index 57eb4d21a..38c9f8839 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.cpp
@@ -640,7 +640,8 @@ void NotifyPluginOptionsPage::on_FinishedPlaying()
 
 void NotifyPluginOptionsPage::on_toggled_checkEnableSound(bool state)
 {
-    bool state1 = 1 ^ state;
+    Q_UNUSED(state);
+    //bool state1 = 1 ^ state;
 
     // QList<Phonon::Path> listOutputs  = _testSound->outputPaths();
     // Phonon::AudioOutput *audioOutput = (Phonon::AudioOutput *)listOutputs.last().sink();
diff --git a/ground/openpilotgcs/src/plugins/notify/notifytablemodel.cpp b/ground/openpilotgcs/src/plugins/notify/notifytablemodel.cpp
index 8871f2352..2e48bf4e9 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifytablemodel.cpp
+++ b/ground/openpilotgcs/src/plugins/notify/notifytablemodel.cpp
@@ -186,6 +186,7 @@ QStringList NotifyTableModel::mimeTypes() const
 bool NotifyTableModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
                                     int column, const QModelIndex & parent)
 {
+    Q_UNUSED(column);
     if (action == Qt::IgnoreAction) {
         return true;
     }
diff --git a/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h b/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h
index 01974baab..9820b2deb 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h
+++ b/ground/openpilotgcs/src/plugins/notify/notifytablemodel.h
@@ -45,6 +45,7 @@ public:
     NotifyTableModel(QList<NotificationItem *> & parentList, QObject *parent = 0);
     int rowCount(const QModelIndex & parent = QModelIndex()) const
     {
+        Q_UNUSED(parent);
         return _list.count();
     }