Fix build to work with latest rust