Fix compilation

(follow changes in rust master)