Yet more adjustments