fixes for latest rust