two more fixes