MT-32: Sync with the latest changes in munt