Fix errors after merge.