Update for Rust changes and make a few tweaks