Fix build issues after merge.