more fixes ..