fix some MR runtime issues