Make work with latest rust