Update to Rust master pt2