Fix compilation

Follow changes in rust master