Fix building with current rustc