Enum Fixes Part 3/3