fixes for the latest rust master