Fixes for recent Rust