Adjustments for 3.1