Merge "Fix warnings from Rust 1.65.0"