More changes for rust-current