Fix more merge code mismatches (so things compile now)