Enum Fixes / Cleanup