Upgraded to latest Rust and Rust-Empty