Playout fixes