Rust nightly fixes