mach-msm : Little upgrades