diff --git a/lib/stream.cpp b/lib/stream.cpp
index 42991239..6e0067cb 100644
--- a/lib/stream.cpp
+++ b/lib/stream.cpp
@@ -1288,11 +1288,11 @@ std::set<size_t> Util::wouldSelect(const DTSC::Meta &M, const std::map<std::stri
       if (it != result.begin()){selected << ", ";}
       selected << *it;
     }
-    MEDIUM_MSG("Selected tracks: %s (%zu)", selected.str().c_str(), result.size());
+    MEDIUM_MSG("Would select tracks: %s (%zu)", selected.str().c_str(), result.size());
   }
 
   if (!result.size() && validTracks.size() && capa["codecs"][bestSoFar].size()){
-    WARN_MSG("No tracks selected (%zu total) for stream!", validTracks.size());
+    WARN_MSG("Would select no tracks (%zu total) for stream!", validTracks.size());
   }
   return result;
 }
diff --git a/src/output/output.cpp b/src/output/output.cpp
index 3aa3ba81..d4b414d7 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -445,6 +445,7 @@ namespace Mist{
     }
 
     //Find elements in new selection but not in old selection
+    diffs.clear();
     std::set_difference(newSelects.begin(), newSelects.end(), oldSelects.begin(), oldSelects.end(), std::inserter(diffs, diffs.end()));
     if (diffs.size()){MEDIUM_MSG("Adding %zu tracks", diffs.size());}
     for (std::set<size_t>::iterator it = diffs.begin(); it != diffs.end(); it++){
@@ -1236,7 +1237,10 @@ namespace Mist{
                 if (amount > 1000){amount = 1000;}
                 Util::sleep(amount);
                 //Make sure we stay responsive to requests and stats while waiting
-                if (wantRequest){requestHandler();}
+                if (wantRequest){
+                  requestHandler();
+                  if (!realTime){break;}
+                }
                 stats();
               }
             }