more fixes 2