Update for latest Rust (remove warnings)