small tuning fixes