Running repair steps in parallel and minor changes