Fixed all the other issues (missing enums, etc.)