Fixups for rust changes