Fix after changes in rust master