Fixes for enum related rust updates.