Fixed enum not found errors