some more fixes ...