Merge "Fix errors from rustc 1.71.0" into main