Merge fixes.