Tuning value fixes