diff --git a/airtime_mvc/application/forms/SoundcloudPreferences.php b/airtime_mvc/application/forms/SoundcloudPreferences.php
index e948ba4f4..b2840d580 100644
--- a/airtime_mvc/application/forms/SoundcloudPreferences.php
+++ b/airtime_mvc/application/forms/SoundcloudPreferences.php
@@ -77,8 +77,9 @@ class Application_Form_SoundcloudPreferences extends Zend_Form_SubForm
             // which is something we don't want
             'allowEmpty' => false,
             'validators' => array(
-                new PasswordNotEmpty(array('UploadToSoundcloudOption'=>'1'))
-            )
+                new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1'))
+            ),
+            'renderPassword' => true 
         ));
 
          // Add the description element
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 3730d3870..8d3722244 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1578,7 +1578,8 @@ class Application_Model_Show {
         ." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s"
         ." WHERE si.show_id = s.id"
         ." AND si.starts <= TIMESTAMP '$timeNow'"
-        ." AND si.ends > TIMESTAMP '$timeNow'";
+        ." AND si.ends > TIMESTAMP '$timeNow'"
+        ." AND modified_instance != TRUE";
 
         // Convert back to local timezone
         $rows = $CC_DBC->GetAll($sql);
@@ -1616,6 +1617,7 @@ class Application_Model_Show {
         ." WHERE si.show_id = s.id"
         ." AND si.starts >= TIMESTAMP '$timeStart'"
         ." AND si.starts < TIMESTAMP $timeEnd"
+        ." AND modified_instance != TRUE"
         ." ORDER BY si.starts";
 
         // defaults to retrieve all shows within the interval if $limit not set
@@ -1638,6 +1640,9 @@ class Application_Model_Show {
     public static function ConvertToLocalTimeZone(&$rows, $columnsToConvert) {
         $timezone = date_default_timezone_get();
 
+        if (!is_array($rows)) {
+            return;
+        }
         foreach($rows as &$row) {
             foreach($columnsToConvert as $column) {
                 $row[$column] = Application_Model_DateHelper::ConvertToLocalDateTimeString($row[$column]);