more fixes ...