More merge fixes.