diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index d9c6c834c..9fcaee13e 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1833,7 +1833,8 @@ SELECT si.starts AS start_timestamp,
        starts,
        ends
 FROM cc_show_instances si,
-     cc_show s
+     LEFT JOIN cc_show s
+     ON si.instance_id = s.id
 WHERE si.show_id = s.id
   AND si.starts <= :timeNow1::timestamp
   AND si.ends > :timeNow2::timestamp
@@ -1875,7 +1876,8 @@ SELECT si.starts AS start_timestamp,
        starts,
        ends
 FROM cc_show_instances si,
-     cc_show s
+     LEFT JOIN cc_show s
+     ON si.instance_id = s.id
 WHERE si.show_id = s.id
   AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
   AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'
@@ -2012,9 +2014,10 @@ SELECT si.starts AS start_timestamp,
        s.url,
        starts,
        ends
-FROM cc_show_instances,
-     cc_show
-WHERE si.show_id = s.id"
+FROM cc_show_instances si
+     LEFT JOIN cc_show s
+     ON si.instance_id = s.id
+WHERE si.show_id = s.id
   AND si.starts >= :timeStart::timestamp
   AND si.starts < :timeEnd::timestamp
   AND modified_instance != TRUE
diff --git a/utils/rabbitmq-update-pid.sh b/utils/rabbitmq-update-pid.sh
index d5360b2fe..a756c0d1c 100755
--- a/utils/rabbitmq-update-pid.sh
+++ b/utils/rabbitmq-update-pid.sh
@@ -5,8 +5,7 @@ pid_found="$?"
 
 if [ "$pid_found" == "0" ]; then
     #PID is available in the status message
-    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
-    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
+    rabbitmqpid=`/etc/init.d/rabbitmq-server status | grep "\[{pid" | sed "s/.*,\(.*\)\}.*/\1/"`
 else
     #PID should be available from file
     rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`