Fixed enum and tuning