Fix bugs after merging.