Merge menu fixes.