Small tweaks to ms