Fix more enums