More merge fixes
More merge fixes