More expansion adjustments