Fix up after rustup