diff --git a/lib/socket.cpp b/lib/socket.cpp
index 6a6cf296..8458c911 100644
--- a/lib/socket.cpp
+++ b/lib/socket.cpp
@@ -518,6 +518,7 @@ unsigned int Socket::Connection::iwrite(const void * buffer, int len) {
     }
   }
   if (r == 0 && (sock >= 0)) {
+    DONTEVEN_MSG("Socket closed by remote");
     close();
   }
   up += r;
@@ -560,6 +561,7 @@ int Socket::Connection::iread(void * buffer, int len, int flags) {
     }
   }
   if (r == 0) {
+    DONTEVEN_MSG("Socket closed by remote");
     close();
   }
   down += r;
diff --git a/src/output/output.cpp b/src/output/output.cpp
index c9087b9c..6c3c7ac2 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -112,7 +112,6 @@ namespace Mist {
       onFail();
       return;
     }
-    selectDefaultTracks();
     sought = false;
   }
 
@@ -126,11 +125,16 @@ namespace Mist {
  
   bool Output::isReadyForPlay() {
     if (myMeta.tracks.size()){
-      for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
-        if (it->second.keys.size() >= 2){
-          return true;
-        }
+      if (!selectedTracks.size()){
+        selectDefaultTracks();
       }
+      if (myMeta.tracks[getMainSelectedTrack()].keys.size() >= 2){
+        return true;
+      }else{
+        HIGH_MSG("NOT READY YET (%lu tracks, %lu = %lu keys)", myMeta.tracks.size(), getMainSelectedTrack(), myMeta.tracks[getMainSelectedTrack()].keys.size());
+      }
+    }else{
+      HIGH_MSG("NOT READY YET (%lu tracks)", myMeta.tracks.size());
     }
     return false;
   }
@@ -167,10 +171,11 @@ namespace Mist {
     }
     stats(true);
     updateMeta();
-    if (myMeta.live && !isReadyForPlay()){
+    selectDefaultTracks();
+    if (!myMeta.vod && !isReadyForPlay()){
       unsigned long long waitUntil = Util::epoch() + 15;
-      while (!isReadyForPlay()){
-        if (Util::epoch() > waitUntil){
+      while (!myMeta.vod && !isReadyForPlay()){
+        if (Util::epoch() > waitUntil + 45 || (!selectedTracks.size() && Util::epoch() > waitUntil)){
           INFO_MSG("Giving up waiting for playable tracks. Stream: %s, IP: %s", streamName.c_str(), getConnectedHost().c_str());
           break;
         }
diff --git a/src/output/output_rtmp.cpp b/src/output/output_rtmp.cpp
index 898ed305..387a3aac 100644
--- a/src/output/output_rtmp.cpp
+++ b/src/output/output_rtmp.cpp
@@ -39,14 +39,7 @@ namespace Mist {
     if (isPushing){
       return true;
     }
-    if (myMeta.tracks.size()){
-      for (std::map<unsigned int, DTSC::Track>::iterator it = myMeta.tracks.begin(); it != myMeta.tracks.end(); it++){
-        if (it->second.keys.size() >= 2){
-          return true;
-        }
-      }
-    }
-    return false;
+    return Output::isReadyForPlay();
   }
 
   std::string OutRTMP::getStatsName(){