Merger fixes.