Fix build for latest Rust