Patch to fix crashes with latest rust