Fix compile errors that have popped up in most recent Rust changes