Fixed enum issues.