Accomodate to recent Rust changes