More timeout adjustments