Various fixes

We now have a clean build on `HEAD` Rust.