Updated to latest Rust: math changes