Fix for latest Rust and cargo master