Fixes for latest Rust nightly