nextSong fixes