more fixes 3