fixes for latest rust incoming