Even more fixes ...