more adjustments in the wake of 5.21.4