Merge "Fix warnings from rustc 1.65.0"