Minor tweaks for MS