Updated some files to the latest Rust