Adjustments for 4.2 dev.