Fix a bunch of corner cases for when need to change nextPlaying