Fixes for the latest Rust master.