Fix bugs after merge.