Update for lastest Rust