More timeout tuning