Fix some misses in merge.