more fixes :D