[m] Minor changes from M3