first adjustments for 3.8.0