Fixed up enums