Fix compile errors after merge.