diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index edb78cec5..abc9ad99b 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -131,9 +131,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
     protected function _initTasks() {
         /* We need to wrap this here so that we aren't checking when we're running the unit test suite
          */
-        $taskManager = TaskManager::getInstance();
-        $taskManager->runTask(AirtimeTask::UPGRADE);  // Run the upgrade on each request (if it needs to be run)
         if (getenv("AIRTIME_UNIT_TEST") != 1) {
+            $taskManager = TaskManager::getInstance();
+            $taskManager->runTask(AirtimeTask::UPGRADE);  // Run the upgrade on each request (if it needs to be run)
             //This will do the upgrade too if it's needed...
             $taskManager->runTasks();
         }
diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 94230e667..be12ea565 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -107,8 +107,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
                                         ));
         $third_party_api->setValue(Application_Model_Preference::GetAllow3rdPartyApi());
         $third_party_api->setDescription(_('Enabling this feature will allow Airtime to provide schedule data
-                                            to external widgets that can be embedded in your website. Enable this
-                                            feature to reveal the embeddable code.'));
+                                            to external widgets that can be embedded in your website.'));
         $third_party_api->setSeparator(' '); //No <br> between radio buttons
         //$third_party_api->addDecorator(new Zend_Form_Decorator_Label(array('tag' => 'dd', 'class' => 'radio-inline-list')));
         $third_party_api->addDecorator('HtmlTag', array('tag' => 'dd',
diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php
index c574c9d7c..a53e1ae24 100644
--- a/airtime_mvc/application/models/airtime/CcFiles.php
+++ b/airtime_mvc/application/models/airtime/CcFiles.php
@@ -149,7 +149,7 @@ class CcFiles extends BaseCcFiles {
 
             //Only accept files with a file extension that we support.
             $fileExtension = pathinfo($originalFilename, PATHINFO_EXTENSION);
-            if (!in_array(strtolower($fileExtension), explode(",", "ogg,mp3,oga,flac,wav,m4a,mp4,opus"))) {
+            if (!in_array(strtolower($fileExtension), array_values(FileDataHelper::getAudioMimeTypeArray()))) {
                 throw new Exception("Bad file extension.");
             }