Merge fixes reported