Misc tweaks
mpd