Fix issues after the merge.