Changes for Rust Upgrade

r? @metajack