Committed merge fixes.