more MR fixes