Yet more post release fixes.