More merge fixes to make the merge branch compile properly.