Fix compile errors due to the merge from master.