mpd: Review fixes