Yet more fixes 3