Yet more fixes.