Replace deprecated MR save calls where appropriate