Union + Enum index fixes.