even more fixes