Fix more of the merge fallout.