Fix errors from merging.