make check fixes for Rust Upgrade