some more fixes...