Fix inconsistencies from merging.