Fixed more Enum stuff.