Minor merge fixes.