even more fixes 2