Make everything more tolerant of MPD going away