diff --git a/audio/opengroundcontrol b/audio/opengroundcontrol
deleted file mode 100755
index 99d22a0..0000000
Binary files a/audio/opengroundcontrol and /dev/null differ
diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index a2059e8..cac132a 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -193,7 +193,9 @@ bool GAudioOutput::startEmergency()
     if (!emergency)
     {
         emergency = true;
-        emergencyTimer->start(1600);
+        // Beep immediately and then start timer
+        beep();
+        emergencyTimer->start(1500);
     }
     return true;
 }
@@ -216,7 +218,9 @@ bool GAudioOutput::stopEmergency()
 
 void GAudioOutput::beep()
 {
-    m_media->setCurrentSource(Phonon::MediaSource(QString("alert.wav").toStdString().c_str()));
+    // Use QFile to transform path for all OS
+    QFile f(MG::DIR::getSupportFilesDirectory()+QString("/audio/alert.wav"));
+    m_media->setCurrentSource(Phonon::MediaSource(f.fileName().toStdString().c_str()));
     m_media->play();
 }