Fixed Enum values - other bug fixes