Initial corrections after merge.