even more fixes :)