more fixes :)