Playlist fixes