diff --git a/airtime_mvc/application/common/DateHelper.php b/airtime_mvc/application/common/DateHelper.php
index 3f7e29006..84c5feb0c 100644
--- a/airtime_mvc/application/common/DateHelper.php
+++ b/airtime_mvc/application/common/DateHelper.php
@@ -53,7 +53,7 @@ class Application_Common_DateHelper
      */
     function getWeekStartDate()
     {
-        $startDate = date('w') == 0 ? date('Y-m-d') : date('Y-m-d', strtotime('monday'));
+        $startDate = date('w') == 0 ? date('Y-m-d') : date('Y-m-d', strtotime('monday this week'));
         $startDateTime = new DateTime($startDate);
         return $startDateTime->format('Y-m-d H:i:s');
     }
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 3123c93e0..76f48b062 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -33,7 +33,8 @@ class Application_Form_EditAudioMD extends Zend_Form
             'label'      => 'Track:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
-            'validators' => array('Int')
+            'validators' => array('Int'),
+            'required' => true
         ));
 
 		// Add genre field
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 31aee00b4..3dd72ff4b 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -886,9 +886,9 @@ Logging::log("getting media! - 2");
                 }
                 
                 // Check if file is playable
-                $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1", $audio_file);
+                $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' 2>&1", $audio_file);
                 exec($command, $output, $rv);
-                if ($rv != 0) {
+                if ($rv != 0 || count($output) != 0) {
                     $result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
                 }
                 else {
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 6681eee49..94ce25608 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -301,6 +301,7 @@ var AIRTIME = (function(AIRTIME){
             
             if (!$el.hasClass("ui-state-disabled")) {
                 $el.addClass("ui-state-hover");
+                $("#show_builder .ui-icon-document-b").contextMenu(true);
             }
             else {
                 $("#show_builder .ui-icon-document-b").contextMenu(false);