Fix errors brought in through merge.