Some playout auto-recovery fixes