Further stability improvements to playlist