and some more fixes...