Fix enum definitions