Fix building with latest rust