Fix issues from merging.