Fixed the enum types