Fix enum types