Yet more fixes