Minor changes to fit M3.