Fix compilation after changes in rust-master