fixes for the latest rust incoming