Yet more fixes 2