Fixes for latest rust