Make it compile with latest rustc

feel free to ignore if you think that's not relevant.