More tweaks to mach-msm