diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index fc40b2801..05b527ee0 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -45,8 +45,6 @@ class Application_Model_Schedule {
         $nextShowID = count($shows['nextShow'])>0?$shows['nextShow'][0]['instance_id']:null;
         $results = Application_Model_Schedule::GetPrevCurrentNext($previousShowID, $currentShowID, $nextShowID, $utcTimeNow);
 
-        Logging::log($shows['currentShow']);
-
         $range = array("env"=>APPLICATION_ENV,
             "schedulerTime"=>$timeNow,
             "previous"=>$results['previous'] !=null?$results['previous']:(count($shows['previousShow'])>0?$shows['previousShow'][0]:null),
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 2392cc81a..57c505713 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1771,7 +1771,7 @@ class Application_Model_Show {
 
         for( $i = 0; $i < $numberOfRows; ++$i ){
             //Find the show that is within the current time.
-            if ((strtotime($rows[$i]['starts']) <= $timeNowAsMillis) && (strtotime($rows[$i]['ends']) >= $timeNowAsMillis)){
+            if ((strtotime($rows[$i]['starts']) <= $timeNowAsMillis) && (strtotime($rows[$i]['ends']) > $timeNowAsMillis)){
                 if ( $i - 1 >= 0){
                     $results['previousShow'][0] = array(
                                 "id"=>$rows[$i-1]['id'],
diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py
index 19d27768d..16b6ceab9 100644
--- a/python_apps/pypo/install/pypo-uninitialize.py
+++ b/python_apps/pypo/install/pypo-uninitialize.py
@@ -9,6 +9,7 @@ if os.geteuid() != 0:
 try:      
     #stop pypo and liquidsoap processes
     print "Waiting for pypo processes to stop...",
+    subprocess.call("rm -f /usr/bin/airtime-liquidsoap")
     if (os.path.exists('/etc/init.d/airtime-playout')):
         subprocess.call("invoke-rc.d airtime-playout stop", shell=True)
         print "OK"