Fix compile after merge.