tuning fixes