Fixed various issues in now_playing