Make it compile with latest rustc