Make more MPD instructions work more or less